diff --git a/usr/lib/archboot/cpio/init.sh b/usr/lib/archboot/cpio/init.sh index d59a9717a..f56c99e26 100755 --- a/usr/lib/archboot/cpio/init.sh +++ b/usr/lib/archboot/cpio/init.sh @@ -106,19 +106,19 @@ _task() { _initrd_stage() { : >/.archboot _task mount & - _progress_wait "0" "99" "\n${_KEEP}\n\n1/5: Searching rootfs on blockdevices..." "0.05" + _progress_wait "0" "99" "\n${_KEEP}\n\nSearching rootfs on blockdevices..." "0.05" : >/.archboot _task check & - _progress_wait "0" "99" "\n${_KEEP}\n\n2/5: Mounting rootfs on blockdevice..." "0.05" + _progress_wait "0" "99" "\n${_KEEP}\n\nMounting rootfs on blockdevice..." "0.05" : >/.archboot _task btrfs & - _progress_wait "0" "99" "\n${_KEEP}\n\n3/5: Creating btrfs on /dev/zram0..." "0.05" + _progress_wait "0" "99" "\n${_KEEP}\n\nCreating btrfs on /dev/zram0..." "0.05" : >/.archboot _task system & - _progress_wait "0" "99" "\n${_KEEP}\n\n4/5: Copying rootfs to /sysroot..." "0.05" + _progress_wait "0" "99" "\n${_KEEP}\n\nCopying rootfs to /sysroot..." "0.05" : >/.archboot _task unmount & - _progress_wait "0" "99" "\n${_KEEP}\n\n5/5: Unmounting rootfs..." "0.05" + _progress_wait "0" "99" "\n${_KEEP}\n\nUnmounting rootfs..." "0.05" _progress "100" "The boot medium can be safely removed now." } # not all devices trigger autoload! @@ -141,7 +141,7 @@ fi _msg "Initializing Console..." _clear setfont ter-v${_SIZE}n -C /dev/console -_initrd_stage | _dialog --title " Initializing System " --gauge "\n${_KEEP}\n\n1/5: Searching rootfs on blockdevices..." 9 75 0 +_initrd_stage | _dialog --title " Initializing System " --gauge "\n${_KEEP}\n\nSearching rootfs on blockdevices..." 9 75 0 _clear _msg "The boot medium can be safely removed now." echo "" diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh index 376d0acab..889eac25f 100644 --- a/usr/lib/archboot/login.sh +++ b/usr/lib/archboot/login.sh @@ -52,12 +52,12 @@ if [[ "${_TTY}" = "tty1" ]]; then [[ -d /run/nextroot ]] || mkdir /run/nextroot : > /.archboot _create_btrfs & - _progress_wait "0" "99" "1/2: Creating btrfs on /dev/zram0..." "0.05" + _progress_wait "0" "99" "Creating btrfs on /dev/zram0..." "0.05" # avoid clipping, insert status message _progress "100" "Creating btrfs on /dev/zram0..." : > /.archboot _copy_root & - _progress_wait "0" "99" "2/2: Copying rootfs to /run/nextroot..." "0.05" + _progress_wait "0" "99" "Copying rootfs to /run/nextroot..." "0.05" # cleanup directories and files rm -r /run/nextroot/sysroot &>"${_NO_LOG}" rm /run/nextroot/sysroot/init &>"${_NO_LOG}" @@ -112,7 +112,7 @@ _run_update_installer() { if [[ "${_TTY}" = "tty1" ]] ; then if ! mount | rg -q 'zram0'; then _TITLE="archboot.com | ${_RUNNING_ARCH} | ${_RUNNING_KERNEL} | Basic Setup | ZRAM" - _switch_root_zram | _dialog --title " Initializing System " --gauge "1/2: Creating btrfs on /dev/zram0..." 6 75 0 | tee -a /dev/ttyS0 /dev/ttyAMA0 /dev/ttyUSB0 /dev/pts/0 2>"${_NO_LOG}" + _switch_root_zram | _dialog --title " Initializing System " --gauge "Creating btrfs on /dev/zram0..." 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)..."