ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-04-13 22:23:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gui-init: skip initial checks if user selects option from mount_boot

Browse Source 
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
This commit is contained in:
Matt DeVillier 2021-09-23 13:20:25 -05:00 committed by tlaurion
parent 43b50788c6
commit a87c54220c
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
initrd/bin/gui-init
View File

@ -48,6 +48,7 @@ mount_boot()
exec /bin/usb-init
;;
m )
skip_to_menu="true"
break
;;
* )
@ -504,6 +505,13 @@ force_unsafe_boot()
# gui-init start
# Use stored HOTP key branding
if [ -r /boot/kexec_hotp_key ]; then
HOTPKEY_BRANDING="$(cat /boot/kexec_hotp_key)"
else
HOTPKEY_BRANDING="HOTP USB Security Dongle"
fi
if detect_boot_device ; then
# /boot device with installed OS found
clean_boot_check
@ -513,15 +521,8 @@ else
mount_boot
fi
# Use stored HOTP key branding
if [ -r /boot/kexec_hotp_key ]; then
HOTPKEY_BRANDING="$(cat /boot/kexec_hotp_key)"
else
HOTPKEY_BRANDING="HOTP USB Security Dongle"
fi
# detect whether any GPG keys exist in the keyring, if not, initialize that first
check_gpg_key && update_totp && update_hotp
[[ "$skip_to_menu" != "true" ]] && check_gpg_key && update_totp && update_hotp
if [[ "$HOTP" = "Success" && $CONFIG_AUTO_BOOT_TIMEOUT ]]; then
prompt_auto_default_boot