From 1c3bd3194daf20a9a71ffc68044f0a81c09559ab Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 4 Sep 2023 08:13:51 +0200
Subject: [PATCH] replace tty11 with LOG

---
 usr/lib/archboot/update/gnome.sh  | 8 ++++----
 usr/lib/archboot/update/plasma.sh | 8 ++++----
 usr/lib/archboot/update/sway.sh   | 2 +-
 usr/lib/archboot/update/xfce.sh   | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/usr/lib/archboot/update/gnome.sh b/usr/lib/archboot/update/gnome.sh
index 705e1e026..362905da1 100644
--- a/usr/lib/archboot/update/gnome.sh
+++ b/usr/lib/archboot/update/gnome.sh
@@ -44,20 +44,20 @@ _install_gnome() {
 }
 
 _start_gnome_wayland() {
-    _progress "100" "Launching GNOME Wayland now, logging is done on /dev/tty11..."
+    _progress "100" "Launching GNOME Wayland now, logging is done on ${_LOG}..."
     sleep 2
-    echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session >/dev/tty11 2>&1" > /usr/bin/gnome-wayland
+    echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session >${_LOG} 2>&1" > /usr/bin/gnome-wayland
     chmod 755 /usr/bin/gnome-wayland
     gnome-wayland
 }
 
 _start_gnome() {
-    _progress "100" "Launching GNOME now, logging is done on /dev/tty11..."
+    _progress "100" "Launching GNOME now, logging is done on ${_LOG}..."
     sleep 2
     echo "export XDG_SESSION_TYPE=x11" > /root/.xinitrc
     #shellcheck disable=SC2129
     echo "export GDK_BACKEND=x11" >> /root/.xinitrc
     echo "exec dbus-launch gnome-session" >> /root/.xinitrc
-    startx >/dev/tty11 2>&1
+    startx >${_LOG} 2>&1
 }
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/update/plasma.sh b/usr/lib/archboot/update/plasma.sh
index f45eb89da..8862fa686 100644
--- a/usr/lib/archboot/update/plasma.sh
+++ b/usr/lib/archboot/update/plasma.sh
@@ -78,18 +78,18 @@ _install_plasma() {
 }
 
 _start_plasma_wayland() {
-    _progress "100" "Launching Plasma/KDE Wayland now, logging is done on /dev/tty11..."
+    _progress "100" "Launching Plasma/KDE Wayland now, logging is done on ${_LOG}..."
     sleep 2
-    echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session startplasma-wayland >/dev/tty11 2>&1" > /usr/bin/plasma-wayland
+    echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session startplasma-wayland >${_LOG} 2>&1" > /usr/bin/plasma-wayland
     chmod 755 /usr/bin/plasma-wayland
     plasma-wayland
 }
 
 _start_plasma() {
-    _progress "100" "Launching Plasma/KDE now, logging is done on /dev/tty11..."
+    _progress "100" "Launching Plasma/KDE now, logging is done on ${_LOG}..."
     sleep 2
     echo "export DESKTOP_SESSION=plasma" > /root/.xinitrc
     echo "exec startplasma-x11" >> /root/.xinitrc
-    startx >/dev/tty11 2>&1
+    startx >${_LOG} 2>&1
 }
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/usr/lib/archboot/update/sway.sh b/usr/lib/archboot/update/sway.sh
index 5684202c4..dfff45b72 100644
--- a/usr/lib/archboot/update/sway.sh
+++ b/usr/lib/archboot/update/sway.sh
@@ -108,7 +108,7 @@ _install_sway() {
 _start_sway() {
     echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland \
         XKB_DEFAULT_LAYOUT=$(grep 'KEYMAP' /etc/vconsole.conf | cut -d '=' -f2 | sed -e 's#-.*##g') \
-        exec dbus-run-session sway >/dev/tty11 2>&1" > /usr/bin/sway-wayland
+        exec dbus-run-session sway >${_LOG} 2>&1" > /usr/bin/sway-wayland
     chmod 755 /usr/bin/sway-wayland
     sway-wayland
 }
diff --git a/usr/lib/archboot/update/xfce.sh b/usr/lib/archboot/update/xfce.sh
index a61537997..72c91e990 100644
--- a/usr/lib/archboot/update/xfce.sh
+++ b/usr/lib/archboot/update/xfce.sh
@@ -245,8 +245,8 @@ EOF
 }
 
 _start_xfce() {
-    _progress "100" "Launching XFCE now, logging is done on /dev/tty11..."
+    _progress "100" "Launching XFCE now, logging is done on ${_LOG}..."
     sleep 2
-    startxfce4 >/dev/tty11 2>&1
+    startxfce4 >${_LOG} 2>&1
 }
 # vim: set ft=sh ts=4 sw=4 et: