From ab97eeab88b7090e8c29e3cf7eab812ba6ba8368 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 27 Jun 2024 19:58:09 +0200
Subject: [PATCH] sync FB method

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

diff --git a/usr/lib/archboot/cpio/hooks/base_common b/usr/lib/archboot/cpio/hooks/base_common
index 20efe9adc..9453468de 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 rm sed setfont sh shutdown sleep sulogin systemctl \
+                 realpath reboot rm sd 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 557600e6e..982b2b2e0 100644
--- a/usr/lib/archboot/cpio/hooks/base_common_system
+++ b/usr/lib/archboot/cpio/hooks/base_common_system
@@ -44,8 +44,8 @@ update-activation-environment,uuidgen} dd df dir du dust exa eza false fd fzf fz
                  login makepkg mktemp mkhomedir_helper modutil more mount.ddi mount.nfs{,4} \
                  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 secret-tool \
-                 shlibsign sign{tool,ver} sort ssltap stat symkeyutil systemd-{ac-power,analyze,ask-password,cat,\
+                 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,\
 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 e75dedcba..477cd4ef9 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))"
-        sleep "${4}"
+        read -r -t "${4}"
     done
 }
 _task() {
@@ -55,7 +55,7 @@ _task() {
             if [[ -b /dev/sr0 ]]; then
                 mount /dev/sr0 /mnt/cdrom &>/dev/null && break
             fi
-            sleep 1
+            read -r -t 1
             _COUNT=$((_COUNT+1))
         done
     fi
@@ -132,7 +132,7 @@ udevadm wait --settle /dev/fb0 -t 10
 _SIZE="16"
 if [[ -e /sys/class/graphics/fb0/modes ]]; then
     # get screen setting mode from /sys
-    _FB_SIZE="$(sed -e 's#.*:##g' -e 's#x.*##g' /sys/class/graphics/fb0/modes 2>/dev/null)"
+    _FB_SIZE="$(rg -o ':(.*)x' -r '$1' /sys/class/graphics/fb0/modes 2>/dev/null)"
     if [[ "${_FB_SIZE}" -gt '1900' ]]; then
         _SIZE="32"
     fi