ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-19 13:07:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1372 from JonathonHall-Purism/fix-benign-script-errors

Browse Source 
Fix benign script errors
This commit is contained in:
tlaurion 2023-04-12 11:19:18 -04:00 committed by GitHub
commit 26d936b934
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
initrd/bin/kexec-select-boot
View File

@ -292,8 +292,8 @@ user_select() {
if [ "$option_confirm" = "d" ]; then if [ "$option_confirm" = "d" ]; then
if [ ! -r "$TMP_KEY_DEVICES" ]; then if [ ! -r "$TMP_KEY_DEVICES" ]; then
# rerun primary boot loop to boot the new default option # continue below to boot the new default option
continue true
else else
echo "+++ Rebooting to start the new default option" echo "+++ Rebooting to start the new default option"
sleep 2 sleep 2

4
initrd/bin/mount-usb
View File

@ -23,7 +23,7 @@ if [ ! -d /media ]; then
fi fi
list_usb_storage > /tmp/usb_block_devices list_usb_storage > /tmp/usb_block_devices
if [ -z `cat /tmp/usb_block_devices` ]; then if [ -z "$(cat /tmp/usb_block_devices)" ]; then
if [ -x /bin/whiptail ]; then if [ -x /bin/whiptail ]; then
whiptail $BG_COLOR --title 'USB Drive Missing' \ whiptail $BG_COLOR --title 'USB Drive Missing' \
--msgbox "Insert your USB drive and press Enter to continue." 16 60 --msgbox "Insert your USB drive and press Enter to continue." 16 60
@ -33,7 +33,7 @@ if [ -z `cat /tmp/usb_block_devices` ]; then
fi fi
sleep 1 sleep 1
list_usb_storage > /tmp/usb_block_devices list_usb_storage > /tmp/usb_block_devices
if [ -z `cat /tmp/usb_block_devices` ]; then if [ -z "$(cat /tmp/usb_block_devices)" ]; then
if [ -x /bin/whiptail ]; then if [ -x /bin/whiptail ]; then
whiptail $BG_COLOR_ERROR --title 'ERROR: USB Drive Missing' \ whiptail $BG_COLOR_ERROR --title 'ERROR: USB Drive Missing' \
--msgbox "USB Drive Missing! Aborting mount attempt.\n\nPress Enter to continue." 16 60 --msgbox "USB Drive Missing! Aborting mount attempt.\n\nPress Enter to continue." 16 60