Append BOOT_ORDER to EEPROM config if not present; add looping to USB boot

This commit is contained in:
Simon Long 2020-05-13 13:48:46 +01:00
parent 4eb2224f0f
commit 0b91529ef6

View File

@ -1205,7 +1205,7 @@ do_boot_order() {
done
if [ "$FILNAME" = "none" ]; then
if [ "$INTERACTIVE" = True ]; then
whiptail --msgbox "No matching EEPROM bin file - aborting" 20 60 2
whiptail --msgbox "No EEPROM bin file found for version $CURDATE - aborting" 20 60 2
fi
return 1
fi
@ -1213,11 +1213,19 @@ do_boot_order() {
vcgencmd bootloader_config > $EECFG
case "$BOOTOPT" in
B1*)
sed $EECFG -i -e "s/^BOOT_ORDER=.*/BOOT_ORDER=0x041/"
if ! grep -q "BOOT_ORDER" $EECFG ; then
sed $EECFG -i -e "\$aBOOT_ORDER=0xf41"
else
sed $EECFG -i -e "s/^BOOT_ORDER=.*/BOOT_ORDER=0xf41/"
fi
STATUS="USB device"
;;
B2*)
if ! grep -q "BOOT_ORDER" $EECFG ; then
sed $EECFG -i -e "\$aBOOT_ORDER=0xf21"
else
sed $EECFG -i -e "s/^BOOT_ORDER=.*/BOOT_ORDER=0xf21/"
fi
STATUS="Network"
;;
*)