From b8eef886a60adb3d79f7673eea86ff996cc9ade9 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Fri, 28 Jun 2024 18:43:07 +0200
Subject: [PATCH] reuse sleep, it does not status 1 on exit than read -r -t

---
 usr/lib/archboot/cpio/hooks/base_common        | 2 +-
 usr/lib/archboot/cpio/hooks/base_common_system | 2 +-
 usr/lib/archboot/cpio/init.sh                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/cpio/hooks/base_common b/usr/lib/archboot/cpio/hooks/base_common
index 54f97ef18..89415b50d 100644
--- a/usr/lib/archboot/cpio/hooks/base_common
+++ b/usr/lib/archboot/cpio/hooks/base_common
@@ -8,7 +8,7 @@ _run ()
     _map _binary bash blkid bsdcpio cat cp cut dialog echo env find grep \
                  gzip halt head init journalctl kmod ln loadkeys logger ls{,blk,mod} \
                  mkdir mkfs.btrfs modprobe less mount mountpoint mv poweroff \
-                 realpath reboot rg rm setfont sh shutdown sulogin systemctl \
+                 realpath reboot rg rm setfont sh shutdown sleep sulogin systemctl \
                  systemd-tmpfiles udevadm umount uname
     # rdinit= kernel parameter defaults to /init
     # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/init/main.c
diff --git a/usr/lib/archboot/cpio/hooks/base_common_system b/usr/lib/archboot/cpio/hooks/base_common_system
index 982b2b2e0..df6f223c4 100644
--- a/usr/lib/archboot/cpio/hooks/base_common_system
+++ b/usr/lib/archboot/cpio/hooks/base_common_system
@@ -45,7 +45,7 @@ update-activation-environment,uuidgen} dd df dir du dust exa eza false fd fzf fz
                  nano nologin nss-config od p11-kit pk12util pam_timestamp_check pacman{,-conf,-key,-db-upgrade} \
                  passwd pgrep pidof pinentry{,-curses} pk{action,check,exec,ttyagent} pluginviewer printf procs ps pwd \
                  rmdir sasldblistusers2 saslpasswd2 tr true repo-{add,elephant,remove} rbash rg rmmod sd sed secret-tool \
-                 shlibsign sign{tool,ver} sleep sort ssltap stat symkeyutil systemd-{ac-power,analyze,ask-password,cat,\
+                 shlibsign sign{tool,ver} sort ssltap stat symkeyutil systemd-{ac-power,analyze,ask-password,cat,\
 cgls,cgtop,confextdelta,detect-virt,escape,firstboot,hwdb,inhibit,machine-id-setup,mount,notify,nspawn,path,\
 resolve,repartrun,socket-activate,stdio-bridge,sysusers,tty-ask-password-agent,umount,creds,cryptenroll,dissect,\
 id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/dbus-1.0/dbus-daemon-launch-helper \
diff --git a/usr/lib/archboot/cpio/init.sh b/usr/lib/archboot/cpio/init.sh
index 477cd4ef9..61ab560e6 100755
--- a/usr/lib/archboot/cpio/init.sh
+++ b/usr/lib/archboot/cpio/init.sh
@@ -37,7 +37,7 @@ _progress_wait() {
             _progress "${2}" "${3}"
         fi
         _COUNT="$((_COUNT+1))"
-        read -r -t "${4}"
+        sleep "${4}"
     done
 }
 _task() {
@@ -55,7 +55,7 @@ _task() {
             if [[ -b /dev/sr0 ]]; then
                 mount /dev/sr0 /mnt/cdrom &>/dev/null && break
             fi
-            read -r -t 1
+            sleep 1
             _COUNT=$((_COUNT+1))
         done
     fi