From df44cc95e3af8b213d2cc30247cbce64d7204c69 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 4 Sep 2023 12:37:25 +0200 Subject: [PATCH] add message after ZRAM creation --- usr/lib/archboot/login.sh | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index aa03f2b0e..b74346a9d 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -52,19 +52,6 @@ if [[ "${TTY}" = "tty1" ]]; then rm -f /sysroot/{VERSION,config,buildconfig,init,.archboot} &>"${_NO_LOG}" _progress "100" "System is ready." read -r -t 1 - # fix clear screen on all terminals - printf "\ec" | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>"${_NO_LOG}" - # https://www.freedesktop.org/software/systemd/man/bootup.html - # enable systemd initrd functionality - : > /etc/initrd-release - # fix /run/nouser issues - systemctl stop systemd-user-sessions.service - # avoid issues by taking down services in ordered way - systemctl stop dbus-org.freedesktop.login1.service - systemctl stop dbus.socket - # prepare for initrd-switch-root - systemctl start initrd-cleanup.service - systemctl start initrd-switch-root.target else while true; do read -r -t 1 @@ -128,6 +115,20 @@ if [[ "${TTY}" = "tty1" ]] ; then if ! mount | grep -q zram0; then _TITLE="Archboot $(uname -m) | Basic Setup | ZRAM" _switch_root_zram | _dialog --title " Initializing System " --gauge "Creating /dev/zram0 with zstd compression..." 6 75 0 | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>"${_NO_LOG}" + # fix clear screen on all terminals + printf "\ec" | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>"${_NO_LOG}" + echo "Launching systemd $(udevadm --version)..." + # https://www.freedesktop.org/software/systemd/man/bootup.html + # enable systemd initrd functionality + : > /etc/initrd-release + # fix /run/nouser issues + systemctl stop systemd-user-sessions.service + # avoid issues by taking down services in ordered way + systemctl stop dbus-org.freedesktop.login1.service + systemctl stop dbus.socket + # prepare for initrd-switch-root + systemctl start initrd-cleanup.service + systemctl start initrd-switch-root.target else if ! [[ -e "${_CACHEDIR}/archboot.db" ]]; then systemctl start systemd-networkd