From ab51302d71bba980470d4ef0e2b62761b4d493a9 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 20 Feb 2023 18:30:09 +0100 Subject: [PATCH] simplify mount loop --- usr/share/archboot/base/init | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/usr/share/archboot/base/init b/usr/share/archboot/base/init index 65833007a..a4a0a2334 100755 --- a/usr/share/archboot/base/init +++ b/usr/share/archboot/base/init @@ -51,16 +51,12 @@ mkfs.btrfs /dev/zram0 &>/dev/null # use discard to get free RAM on delete! mount -o discard /dev/zram0 /sysroot &>/dev/null echo -e "\e[1mStep 3/4:\e[m Searching for archboot rootfs on usb/hd/cdrom device..." -COUNT=0 echo -e " Trying for 10 seconds /dev/sr0..." -while ! mount /dev/sr0 /cdrom &>/dev/null; do - read -r -t 1 - _COUNT=$((_COUNT+1)) - [[ "${_COUNT}" == 10 ]] && break -done echo -e " Trying for 10 seconds UUID=1234-ABCD..." _COUNT=0 -while ! mount UUID=1234-ABCD /mnt &>/dev/null; do +while true; do + mount UUID=1234-ABCD /mnt &>/dev/null && break + mount /dev/sr0 /cdrom &>/dev/null && break read -r -t 1 _COUNT=$((_COUNT+1)) [[ "${_COUNT}" == 10 ]] && break