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

reuse sleep, it does not status 1 on exit than read -r -t

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 18:43:07 +02:00
parent 5886337161
commit b8eef886a6
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/cpio/hooks/base_common
View file

@ -8,7 +8,7 @@ _run ()
_map _binary bash blkid bsdcpio cat cp cut dialog echo env find grep \ _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} \ gzip halt head init journalctl kmod ln loadkeys logger ls{,blk,mod} \
mkdir mkfs.btrfs modprobe less mount mountpoint mv poweroff \ 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 systemd-tmpfiles udevadm umount uname
# rdinit= kernel parameter defaults to /init # rdinit= kernel parameter defaults to /init
# https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/init/main.c # https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/init/main.c

2
usr/lib/archboot/cpio/hooks/base_common_system
View file

@ -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} \ 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 \ 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 \ 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,\ 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,\ 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 \ id128,sysext} tar tee testpkg top touch trust tty unix_{chkpwd,update} /usr/lib/dbus-1.0/dbus-daemon-launch-helper \

4
usr/lib/archboot/cpio/init.sh
View file

@ -37,7 +37,7 @@ _progress_wait() {
_progress "${2}" "${3}" _progress "${2}" "${3}"
fi fi
_COUNT="$((_COUNT+1))" _COUNT="$((_COUNT+1))"
read -r -t "${4}" sleep "${4}"
done done
} }
_task() { _task() {
@ -55,7 +55,7 @@ _task() {
if [[ -b /dev/sr0 ]]; then if [[ -b /dev/sr0 ]]; then
mount /dev/sr0 /mnt/cdrom &>/dev/null && break mount /dev/sr0 /mnt/cdrom &>/dev/null && break
fi fi
read -r -t 1 sleep 1
_COUNT=$((_COUNT+1)) _COUNT=$((_COUNT+1))
done done
fi fi