root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-19 19:40:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

use VC 11 | /dev/tty11 for logging archboot progress

Browse source
This commit is contained in:
Tobias Powalowski 2023-08-28 21:13:04 +02:00
parent e5a0ce3a07
commit e864346531
9 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/basic-common.sh
View file

@ -4,7 +4,7 @@
LANG=C
_ANSWER="/.$(basename "${0}")"
_RUNNING_ARCH="$(uname -m)"
_LOG="/dev/tty7"
_LOG="/dev/tty11"
_NO_LOG="/dev/null"
_LABEL="Exit"
_DLPROG="wget -q"

2
usr/lib/archboot/common.sh
View file

@ -4,7 +4,7 @@
. /etc/archboot/defaults
_BASENAME=${0##*/}
_RUNNING_ARCH="$(uname -m)"
_LOG="/dev/tty7"
_LOG="/dev/tty11"
_NO_LOG="/dev/null"
_KEYRING="archlinux-keyring"
if echo "${_BASENAME}" | grep -qw aarch64; then

6
usr/lib/archboot/installer/base.sh
View file

@ -2,11 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
# created by Tobias Powalowski <tpowa@archlinux.org>
_ANSWER="/tmp/.setup"
if pgrep -x Xorg &>"${_NO_LOG}"; then
_LOG="/dev/tty8"
else
_LOG="/dev/tty7"
fi
_LOG="/dev/tty11"
_VC_NUM="$(basename ${_LOG} | sed -e 's#tty##g')"
_VC="VC${_VC_NUM}"
# install stages

8
usr/lib/archboot/update/gnome.sh
View file

@ -44,20 +44,20 @@ _install_gnome() {
}
_start_gnome_wayland() {
_progress "100" "Launching GNOME Wayland now, logging is done on /dev/tty8..."
_progress "100" "Launching GNOME Wayland now, logging is done on /dev/tty11..."
sleep 2
echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session gnome-session >/dev/tty7 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 >/dev/tty11 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/tty8..."
_progress "100" "Launching GNOME now, logging is done on /dev/tty11..."
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/tty8 2>&1
startx >/dev/tty11 2>&1
}
# vim: set ft=sh ts=4 sw=4 et:

8
usr/lib/archboot/update/plasma.sh
View file

@ -78,18 +78,18 @@ _install_plasma() {
}
_start_plasma_wayland() {
_progress "100" "Launching Plasma/KDE Wayland now, logging is done on /dev/tty8..."
_progress "100" "Launching Plasma/KDE Wayland now, logging is done on /dev/tty11..."
sleep 2
echo "MOZ_ENABLE_WAYLAND=1 QT_QPA_PLATFORM=wayland XDG_SESSION_TYPE=wayland exec dbus-run-session startplasma-wayland >/dev/tty7 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 >/dev/tty11 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/tty8..."
_progress "100" "Launching Plasma/KDE now, logging is done on /dev/tty11..."
sleep 2
echo "export DESKTOP_SESSION=plasma" > /root/.xinitrc
echo "exec startplasma-x11" >> /root/.xinitrc
startx >/dev/tty8 2>&1
startx >/dev/tty11 2>&1
}
# vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/archboot/update/sway.sh
View file

@ -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/tty7 2>&1" > /usr/bin/sway-wayland
exec dbus-run-session sway >/dev/tty11 2>&1" > /usr/bin/sway-wayland
chmod 755 /usr/bin/sway-wayland
sway-wayland
}

2
usr/lib/archboot/update/update.sh
View file

@ -18,7 +18,7 @@ _INST="/${_LIB}/installer"
_HELP="/${_LIB}/installer/help"
_RUN="/${_LIB}/run"
_UPDATE="/${_LIB}/update"
_LOG="/dev/tty7"
_LOG="/dev/tty11"
_NO_LOG="/dev/null"
_VC_NUM="$(basename ${_LOG} | sed -e 's#tty##g')"
_VC="VC${_VC_NUM}"

4
usr/lib/archboot/update/xfce.sh
View file

@ -245,8 +245,8 @@ EOF
}
_start_xfce() {
_progress "100" "Launching XFCE now, logging is done on /dev/tty8..."
_progress "100" "Launching XFCE now, logging is done on /dev/tty11..."
sleep 2
startxfce4 >/dev/tty8 2>&1
startxfce4 >/dev/tty11 2>&1
}
# vim: set ft=sh ts=4 sw=4 et:

2
usr/lib/initcpio/install/archboot_motd
View file

@ -12,7 +12,7 @@ build ()
#shellcheck disable=SC2129
echo -e "\e[1m----------------------------------------\e[m" >> "${MOTD}"
echo -e "\e[1mVconsole:\e[m" >> "${MOTD}"
echo -e " - Use the \e[1;92mALT + F1 - F7\e[m keys to change the virtual console." >> "${MOTD}"
echo -e " - Use the \e[1;92mALT + F1 - F12\e[m keys to change the virtual console." >> "${MOTD}"
if echo "${HOOKS[@]}" | grep -qw archboot_net; then
#shellcheck disable=SC2129
echo -e "\e[1mFor Additional Wi-Fi Authentification Or Online Help:\e[m" >> "${MOTD}"