Merge pull request #576 from merge/power_off_gui

gui-init: reorder, simplify main menu entries and add Power Off entry
This commit is contained in:
Kyle Rankin 2019-05-27 09:27:50 -07:00 committed by GitHub
commit f4b5ea9d04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -174,22 +174,24 @@ while true; do
whiptail $MAIN_MENU_BG_COLOR --clear --title "$CONFIG_BOOT_GUI_MENU_NAME" \
--menu "$date\nTOTP: $TOTP | HOTP: $HOTP" 20 90 10 \
'y' ' Default boot' \
'a' ' Advanced Settings -->' \
'x' ' Exit to recovery shell' \
'r' ' Refresh TOTP/HOTP' \
'a' ' Settings -->' \
'P' ' Power Off' \
2>/tmp/whiptail || recovery "GUI menu failed"
totp_confirm=$(cat /tmp/whiptail)
fi
if [ "$totp_confirm" = "a" ]; then
whiptail --clear --title "Advanced Settings" \
--menu "Configure Advanced Settings" 20 90 10 \
whiptail --clear --title "Settings" \
--menu "Configure Settings" 20 90 10 \
'o' ' Other Boot Options -->' \
't' ' TPM/TOTP/HOTP Options -->' \
's' ' Update checksums and sign all files in /boot' \
'c' ' Change configuration settings -->' \
'f' ' Flash/Update the BIOS -->' \
'G' ' GPG Options -->' \
'x' ' Exit to recovery shell' \
'r' ' <-- Return to main menu' \
2>/tmp/whiptail || recovery "GUI menu failed"
@ -213,7 +215,6 @@ while true; do
--menu "Select An Option" 20 90 10 \
'g' ' Generate new TOTP/HOTP secret' \
'p' ' Reset the TPM' \
'r' ' TOTP/HOTP does not match, refresh code' \
'n' ' TOTP/HOTP does not match after refresh, troubleshoot' \
'r' ' <-- Return to main menu' \
2>/tmp/whiptail || recovery "GUI menu failed"
@ -330,6 +331,10 @@ while true; do
continue
fi
if [ "$totp_confirm" = "P" ]; then
poweroff
fi
if [ "$totp_confirm" = "y" -o -n "$totp_confirm" ]; then
# Try to boot the default
mount_boot