ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2024-12-18 20:47:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Skip prompt to set default boot when booting from USB

Browse Source 
Since a USB boot target can't be the default (at least currently,
/boot must be on internal media), skip the extraneous prompt to
set it as such when booting from USB.

Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2019-05-18 20:13:32 -05:00
parent 3306dbb66d
commit 65d669d408
No known key found for this signature in database
GPG Key ID: 2BBB776A35B978FD
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,8 @@ valid_rollback="n"
force_menu="n"
gui_menu="n"
force_boot="n"
while getopts "b:d:p:a:r:c:uimgf" arg; do
skip_confirm="n"
while getopts "b:d:p:a:r:c:uimgfs" arg; do
case $arg in
b) bootdir="$OPTARG" ;;
d) paramsdev="$OPTARG" ;;
@ -27,6 +28,7 @@ while getopts "b:d:p:a:r:c:uimgf" arg; do
i) valid_hash="y"; valid_rollback="y" ;;
g) gui_menu="y" ;;
f) force_boot="y"; valid_hash="y"; valid_rollback="y" ;;
s) skip_confirm="y" ;;
esac
done
@ -255,7 +257,7 @@ user_select() {
do
get_menu_option
# In force boot mode, no need offer the option to set a default, just boot
if [ "$force_boot" = "y" ]; then
if [[ "$force_boot" = "y" || "$skip_confirm" = "y" ]]; then
do_boot
else
confirm_menu_option

4
initrd/bin/usb-scan
View File

@ -81,9 +81,9 @@ fi
echo "!!! Could not find any ISO, trying bootable USB"
# Attempt to pull verified config from device
if [ -x /bin/whiptail ]; then
kexec-select-boot -b /media -c "*.cfg" -u -g
kexec-select-boot -b /media -c "*.cfg" -u -g -s
else
kexec-select-boot -b /media -c "*.cfg" -u
kexec-select-boot -b /media -c "*.cfg" -u -s
fi
die "Something failed in selecting boot"