mirror of
https://github.com/linuxboot/heads.git
synced 2024-12-19 21:17:55 +00:00
Change '16 60'-sized whiptail prompts to '0 80'
Some prompts were missed when changing to 0 80 the first time around, and some new ones were added thinking that size was intentional. Replace '16 60' with '0 80' globally. Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>
This commit is contained in:
Jonathon Hall
parent
09d8bf9930
commit
e0c03be341
@ -16,7 +16,7 @@ read_rom() {
|
||||
/bin/flash.sh -r "$1"
|
||||
if [ ! -s "$1" ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: BIOS Read Failed!' \
|
||||
--msgbox "Unable to read BIOS" 16 60
|
||||
--msgbox "Unable to read BIOS" 0 80
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -97,7 +97,7 @@ while true; do
|
||||
CURRENT_OPTION="$(load_config_value CONFIG_BOOT_DEV)"
|
||||
if ! fdisk -l | grep "Disk /dev/" | cut -f2 -d " " | cut -f1 -d ":" > /tmp/disklist.txt ; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: No bootable devices found' \
|
||||
--msgbox " $ERROR\n\n" 16 60
|
||||
--msgbox " $ERROR\n\n" 0 80
|
||||
exit 1
|
||||
fi
|
||||
# filter out extraneous options
|
||||
@ -128,7 +128,7 @@ while true; do
|
||||
if ! mount -o ro $SELECTED_FILE /boot 2>/tmp/error ; then
|
||||
ERROR=`cat /tmp/error`
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: unable to mount /boot' \
|
||||
--msgbox " $ERROR\n\n" 16 60
|
||||
--msgbox " $ERROR\n\n" 0 80
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -136,7 +136,7 @@ while true; do
|
||||
combine_configs
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "The /boot device was successfully changed to $SELECTED_FILE" 16 60
|
||||
--msgbox "The /boot device was successfully changed to $SELECTED_FILE" 0 80
|
||||
;;
|
||||
"s" )
|
||||
read_rom /tmp/config-gui.rom
|
||||
@ -147,7 +147,7 @@ while true; do
|
||||
--yesno "This will reflash your BIOS with the updated version\n\nDo you want to proceed?" 0 80) then
|
||||
/bin/flash.sh /tmp/config-gui.rom
|
||||
whiptail --title 'BIOS Updated Successfully' \
|
||||
--msgbox "BIOS updated successfully.\n\nIf your keys have changed, be sure to re-sign all files in /boot\nafter you reboot.\n\nPress Enter to reboot" 16 60
|
||||
--msgbox "BIOS updated successfully.\n\nIf your keys have changed, be sure to re-sign all files in /boot\nafter you reboot.\n\nPress Enter to reboot" 0 80
|
||||
/bin/reboot
|
||||
else
|
||||
exit 0
|
||||
@ -180,7 +180,7 @@ while true; do
|
||||
/bin/tpm-reset
|
||||
fi
|
||||
whiptail --title 'Configuration Reset Updated Successfully' \
|
||||
--msgbox "Configuration reset and BIOS updated successfully.\n\nPress Enter to reboot" 16 60
|
||||
--msgbox "Configuration reset and BIOS updated successfully.\n\nPress Enter to reboot" 0 80
|
||||
/bin/reboot
|
||||
else
|
||||
exit 0
|
||||
@ -213,7 +213,7 @@ while true; do
|
||||
combine_configs
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "The root device was successfully changed to $SELECTED_FILE" 16 60
|
||||
--msgbox "The root device was successfully changed to $SELECTED_FILE" 0 80
|
||||
;;
|
||||
"D" )
|
||||
CURRENT_OPTION="$(load_config_value CONFIG_ROOT_DIRLIST)"
|
||||
@ -234,7 +234,7 @@ while true; do
|
||||
#check if list empty
|
||||
if [ -z "$NEW_CONFIG_ROOT_DIRLIST" ] ; then
|
||||
whiptail --title 'Config change canceled' \
|
||||
--msgbox "Root device directory change canceled by user" 16 60
|
||||
--msgbox "Root device directory change canceled by user" 0 80
|
||||
break
|
||||
fi
|
||||
|
||||
@ -242,7 +242,7 @@ while true; do
|
||||
combine_configs
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "The root directories to hash was successfully changed to:\n$NEW_CONFIG_ROOT_DIRLIST" 16 60
|
||||
--msgbox "The root directories to hash was successfully changed to:\n$NEW_CONFIG_ROOT_DIRLIST" 0 80
|
||||
;;
|
||||
"B" )
|
||||
CURRENT_OPTION="$(load_config_value CONFIG_ROOT_CHECK_AT_BOOT)"
|
||||
@ -250,7 +250,7 @@ while true; do
|
||||
# Root device and directories must be set to enable this
|
||||
if [ -z "$(load_config_value CONFIG_ROOT_DEV)" ] || [ -z "$(load_config_value CONFIG_ROOT_DIRLIST)" ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'Root Check Not Configured' \
|
||||
--msgbox "Set the root device and directories to hash before enabling this feature." 16 60
|
||||
--msgbox "Set the root device and directories to hash before enabling this feature." 0 80
|
||||
elif (whiptail --title 'Enable Root Hash Check at Boot?' \
|
||||
--yesno "This will enable checking root hashes each time you boot.
|
||||
\nDepending on the directories you are checking, this might add
|
||||
@ -270,7 +270,7 @@ while true; do
|
||||
fi
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "The root device will be checked at each boot." 16 60
|
||||
--msgbox "The root device will be checked at each boot." 0 80
|
||||
|
||||
fi
|
||||
else
|
||||
@ -282,14 +282,14 @@ while true; do
|
||||
combine_configs
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "The root device will not be checked at each boot." 16 60
|
||||
--msgbox "The root device will not be checked at each boot." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
"P" )
|
||||
if [ "$CONFIG_RESTRICTED_BOOT" = "y" ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'Restricted Boot Active' \
|
||||
--msgbox "Disable Restricted Boot to enable Basic Mode." 16 60
|
||||
--msgbox "Disable Restricted Boot to enable Basic Mode." 0 80
|
||||
elif [ "$CONFIG_BASIC" != "y" ]; then
|
||||
if (whiptail --title "Enable $CONFIG_BRAND_NAME Basic Mode?" \
|
||||
--yesno "This will remove all signature checking on the firmware
|
||||
@ -299,7 +299,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "$CONFIG_BRAND_NAME Basic mode enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "$CONFIG_BRAND_NAME Basic mode enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
|
||||
fi
|
||||
else
|
||||
@ -311,7 +311,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC" "n"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "$CONFIG_BRAND_NAME Basic mode has been disabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "$CONFIG_BRAND_NAME Basic mode has been disabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
@ -328,7 +328,7 @@ while true; do
|
||||
set_user_config "CONFIG_RESTRICTED_BOOT" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Restricted Boot mode enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Restricted Boot mode enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
|
||||
fi
|
||||
else
|
||||
@ -346,7 +346,7 @@ while true; do
|
||||
if ! wipe-totp >/dev/null 2>/tmp/error; then
|
||||
ERROR=$(tail -n 1 /tmp/error | fold -s)
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: erasing TOTP secret' \
|
||||
--msgbox "Erasing TOTP Secret Failed\n\n${ERROR}" 16 60
|
||||
--msgbox "Erasing TOTP Secret Failed\n\n${ERROR}" 0 80
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -364,7 +364,7 @@ while true; do
|
||||
|
||||
/bin/flash.sh /tmp/config-gui.rom
|
||||
whiptail --title 'BIOS Updated Successfully' \
|
||||
--msgbox "BIOS updated successfully.\n\nIf your keys have changed, be sure to re-sign all files in /boot\nafter you reboot.\n\nPress Enter to reboot" 16 60
|
||||
--msgbox "BIOS updated successfully.\n\nIf your keys have changed, be sure to re-sign all files in /boot\nafter you reboot.\n\nPress Enter to reboot" 0 80
|
||||
/bin/reboot
|
||||
fi
|
||||
fi
|
||||
@ -378,7 +378,7 @@ while true; do
|
||||
set_user_config "CONFIG_USE_BLOB_JAIL" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Firmware Blob Jail use has been enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Firmware Blob Jail use has been enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
|
||||
fi
|
||||
else
|
||||
@ -389,7 +389,7 @@ while true; do
|
||||
set_user_config "CONFIG_USE_BLOB_JAIL" "n"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Firmware Blob Jail use has been disabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Firmware Blob Jail use has been disabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
@ -404,7 +404,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Automatic default boot disabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Automatic default boot disabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
else
|
||||
if (whiptail --title 'Enable automatic default boot?' \
|
||||
@ -414,7 +414,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "n"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Automatic default boot enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Automatic default boot enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
@ -428,7 +428,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC_USB_AUTOBOOT" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "USB automatic boot enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "USB automatic boot enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
else
|
||||
if (whiptail --title 'Disable USB automatic boot?' \
|
||||
@ -438,7 +438,7 @@ while true; do
|
||||
set_user_config "CONFIG_BASIC_USB_AUTOBOOT" "n"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "USB automatic boot disabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "USB automatic boot disabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
@ -451,7 +451,7 @@ while true; do
|
||||
set_user_config "CONFIG_AUTOMATIC_POWERON" "y"
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Automatic power-on enabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Automatic power-on enabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
else
|
||||
if (whiptail --title 'Disable automatic power-on?' \
|
||||
@ -466,7 +466,7 @@ while true; do
|
||||
set_ec_poweron.sh n
|
||||
|
||||
whiptail --title 'Config change successful' \
|
||||
--msgbox "Automatic power-on disabled;\nsave the config change and reboot for it to go into effect." 16 60
|
||||
--msgbox "Automatic power-on disabled;\nsave the config change and reboot for it to go into effect." 0 80
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
|
||||
@ -9,7 +9,7 @@ TRACE "Under /bin/flash-gui.sh"
|
||||
|
||||
if [ "$CONFIG_RESTRICTED_BOOT" = y ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'Restricted Boot Active' \
|
||||
--msgbox "Disable Restricted Boot to flash new firmware." 16 60
|
||||
--msgbox "Disable Restricted Boot to flash new firmware." 0 80
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
@ -73,7 +73,7 @@ gpg_flash_rom() {
|
||||
fi
|
||||
|
||||
whiptail --title 'Files in /boot Updated Successfully'\
|
||||
--msgbox "Checksums have been updated and /boot files signed.\n\nPress Enter to reboot" 16 60
|
||||
--msgbox "Checksums have been updated and /boot files signed.\n\nPress Enter to reboot" 0 80
|
||||
/bin/reboot
|
||||
|
||||
}
|
||||
@ -99,7 +99,7 @@ gpg_post_gen_mgmt() {
|
||||
/bin/flash.sh -r /tmp/gpg-gui.rom
|
||||
if [ ! -s /tmp/gpg-gui.rom ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: BIOS Read Failed!' \
|
||||
--msgbox "Unable to read BIOS" 16 60
|
||||
--msgbox "Unable to read BIOS" 0 80
|
||||
exit 1
|
||||
fi
|
||||
PUBKEY="/tmp/${GPG_GEN_KEY}.asc"
|
||||
@ -125,7 +125,7 @@ gpg_add_key_reflash() {
|
||||
/bin/flash.sh -r /tmp/gpg-gui.rom
|
||||
if [ ! -s /tmp/gpg-gui.rom ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: BIOS Read Failed!' \
|
||||
--msgbox "Unable to read BIOS" 16 60
|
||||
--msgbox "Unable to read BIOS" 0 80
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -216,10 +216,10 @@ while true; do
|
||||
cp "/tmp/public-key.asc" "/media/public-key.asc"
|
||||
if [ $? -eq 0 ]; then
|
||||
whiptail --title "The GPG Key Copied Successfully" \
|
||||
--msgbox "public-key.asc copied successfully." 16 60
|
||||
--msgbox "public-key.asc copied successfully." 0 80
|
||||
else
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Copy Failed' \
|
||||
--msgbox "Unable to copy public-key.asc to /media" 16 60
|
||||
--msgbox "Unable to copy public-key.asc to /media" 0 80
|
||||
fi
|
||||
umount /media
|
||||
fi
|
||||
|
||||
@ -111,7 +111,7 @@ verify_global_hashes()
|
||||
if [ $CHANGED_FILES_COUNT -gt 10 ]; then
|
||||
# drop to console to show full file list
|
||||
whiptail $ERROR_BG_COLOR --title 'ERROR: Boot Hash Mismatch' \
|
||||
--msgbox "${CHANGED_FILES_COUNT} files failed the verification process!\\n\nThis could indicate a compromise!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return." 16 60
|
||||
--msgbox "${CHANGED_FILES_COUNT} files failed the verification process!\\n\nThis could indicate a compromise!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return." 0 80
|
||||
|
||||
echo "Type \"q\" to exit the list and return." >> /tmp/hash_output_mismatches
|
||||
less /tmp/hash_output_mismatches
|
||||
@ -614,7 +614,7 @@ force_unsafe_boot()
|
||||
{
|
||||
TRACE "Under /bin/gui-init:force_unsafe_boot"
|
||||
if [ "$CONFIG_RESTRICTED_BOOT" = y ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Restricted Boot Enabled' --msgbox "Restricted Boot is Enabled, forced boot not allowed.\n\nPress OK to return to the Main Menu" 16 60
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Restricted Boot Enabled' --msgbox "Restricted Boot is Enabled, forced boot not allowed.\n\nPress OK to return to the Main Menu" 0 80
|
||||
return
|
||||
fi
|
||||
# Run the menu selection in "force" mode, bypassing hash checks
|
||||
|
||||
@ -94,7 +94,7 @@ verify_global_hashes()
|
||||
# root-hashes-gui.sh handles the GUI error menu, just die here
|
||||
if [ "$gui_menu" = "y" ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Root Hash Mismatch' \
|
||||
--msgbox "The root hash check failed!\nExiting to a recovery shell" 16 60
|
||||
--msgbox "The root hash check failed!\nExiting to a recovery shell" 0 80
|
||||
fi
|
||||
die "root hash mismatch, see /tmp/hash_output_mismatches for details"
|
||||
fi
|
||||
@ -250,7 +250,7 @@ default_select() {
|
||||
if [ "$option" != "$expectedoption" ]; then
|
||||
if [ "$gui_menu" = "y" ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Boot Entry Has Changed' \
|
||||
--msgbox "The list of boot entries has changed\n\nPlease set a new default" 16 60
|
||||
--msgbox "The list of boot entries has changed\n\nPlease set a new default" 0 80
|
||||
fi
|
||||
warn "!!! Boot entry has changed - please set a new default"
|
||||
return
|
||||
|
||||
@ -15,7 +15,7 @@ list_usb_storage > /tmp/usb_block_devices
|
||||
if [ -z "$(cat /tmp/usb_block_devices)" ]; then
|
||||
if [ -x /bin/whiptail ]; then
|
||||
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." 0 80
|
||||
else
|
||||
echo "+++ USB Drive Missing! Insert your USB drive and press Enter to continue."
|
||||
read
|
||||
@ -25,7 +25,7 @@ if [ -z "$(cat /tmp/usb_block_devices)" ]; then
|
||||
if [ -z "$(cat /tmp/usb_block_devices)" ]; then
|
||||
if [ -x /bin/whiptail ]; then
|
||||
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." 0 80
|
||||
else
|
||||
echo "!!! ERROR: USB Drive Missing! Aborting mount. Press Enter to continue."
|
||||
fi
|
||||
|
||||
@ -15,7 +15,7 @@ export CONFIG_ROOT_DIRLIST_PRETTY=$(echo $CONFIG_ROOT_DIRLIST | sed -e 's/^/\//;
|
||||
update_root_checksums() {
|
||||
if ! detect_root_device; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: No Valid Root Disk Found' \
|
||||
--msgbox "No Valid Root Disk Found" 16 60
|
||||
--msgbox "No Valid Root Disk Found" 0 80
|
||||
die "No Valid Root Disk Found"
|
||||
fi
|
||||
|
||||
@ -24,7 +24,7 @@ update_root_checksums() {
|
||||
if ! mount -o rw /boot; then
|
||||
unmount_root_device
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Unable to mount /boot' \
|
||||
--msgbox "Unable to mount /boot" 16 60
|
||||
--msgbox "Unable to mount /boot" 0 80
|
||||
die "Unable to mount /boot"
|
||||
fi
|
||||
else
|
||||
@ -40,14 +40,14 @@ update_root_checksums() {
|
||||
update_checksums
|
||||
|
||||
whiptail --title 'Root Hashes Updated and Signed' \
|
||||
--msgbox "All files in:\n$CONFIG_ROOT_DIRLIST_PRETTY\nhave been hashed and signed successfully" 16 60
|
||||
--msgbox "All files in:\n$CONFIG_ROOT_DIRLIST_PRETTY\nhave been hashed and signed successfully" 0 80
|
||||
|
||||
unmount_root_device
|
||||
}
|
||||
check_root_checksums() {
|
||||
if ! detect_root_device; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: No Valid Root Disk Found' \
|
||||
--msgbox "No Valid Root Disk Found" 16 60
|
||||
--msgbox "No Valid Root Disk Found" 0 80
|
||||
die "No Valid Root Disk Found"
|
||||
fi
|
||||
|
||||
@ -56,7 +56,7 @@ check_root_checksums() {
|
||||
if ! mount -o ro /boot; then
|
||||
unmount_root_device
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Unable to mount /boot' \
|
||||
--msgbox "Unable to mount /boot" 16 60
|
||||
--msgbox "Unable to mount /boot" 0 80
|
||||
die "Unable to mount /boot"
|
||||
fi
|
||||
fi
|
||||
@ -80,7 +80,7 @@ check_root_checksums() {
|
||||
if ! sha256sum `find /boot/kexec*.txt` | gpgv /boot/kexec.sig - > /tmp/hash_output; then
|
||||
ERROR=`cat /tmp/hash_output`
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Signature Failure' \
|
||||
--msgbox "The signature check on hash files failed:\n${CHANGED_FILES}\nExiting to a recovery shell" 16 60
|
||||
--msgbox "The signature check on hash files failed:\n${CHANGED_FILES}\nExiting to a recovery shell" 0 80
|
||||
unmount_root_device
|
||||
die 'Invalid signature'
|
||||
fi
|
||||
@ -93,7 +93,7 @@ check_root_checksums() {
|
||||
mv /tmp/new_file_diff2 /tmp/new_file_diff
|
||||
CHANGED_FILES_COUNT=$(wc -l /tmp/new_file_diff | cut -f1 -d ' ')
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Files Added/Removed in Root ' \
|
||||
--msgbox "${CHANGED_FILES_COUNT} files were added/removed in root!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return to the menu." 16 60
|
||||
--msgbox "${CHANGED_FILES_COUNT} files were added/removed in root!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return to the menu." 0 80
|
||||
|
||||
echo "Type \"q\" to exit the list and return to the menu." >> /tmp/new_file_diff
|
||||
less /tmp/new_file_diff
|
||||
@ -130,7 +130,7 @@ check_root_checksums() {
|
||||
CHANGED_FILES=$(grep -v 'OK$' /tmp/hash_output | cut -f1 -d ':' | tee -a /tmp/hash_output_mismatches)
|
||||
CHANGED_FILES_COUNT=$(wc -l /tmp/hash_output_mismatches | cut -f1 -d ' ')
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Root Hash Mismatch' \
|
||||
--msgbox "${CHANGED_FILES_COUNT} files failed the verification process!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return to the menu." 16 60
|
||||
--msgbox "${CHANGED_FILES_COUNT} files failed the verification process!\n\nHit OK to review the list of files.\n\nType \"q\" to exit the list and return to the menu." 0 80
|
||||
unmount_root_device
|
||||
|
||||
echo "Type \"q\" to exit the list and return to the menu." >> /tmp/hash_output_mismatches
|
||||
@ -255,7 +255,7 @@ while true; do
|
||||
if ! mount -o ro /boot; then
|
||||
unmount_root_device
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Unable to mount /boot' \
|
||||
--msgbox "Unable to mount /boot" 16 60
|
||||
--msgbox "Unable to mount /boot" 0 80
|
||||
die "Unable to mount /boot"
|
||||
fi
|
||||
fi
|
||||
@ -291,7 +291,7 @@ while true; do
|
||||
check_root_checksums
|
||||
if [ $? -eq 0 ]; then
|
||||
whiptail --title 'Verified Root Hashes' \
|
||||
--msgbox "All files in $CONFIG_ROOT_DIRLIST_PRETTY passed the verification process" 16 60
|
||||
--msgbox "All files in $CONFIG_ROOT_DIRLIST_PRETTY passed the verification process" 0 80
|
||||
fi
|
||||
;;
|
||||
"u" )
|
||||
|
||||
@ -24,11 +24,11 @@ mount_usb()
|
||||
mount-usb && USB_FAILED=0 || ( [ $? -eq 5 ] && exit 1 || USB_FAILED=1 )
|
||||
if [ $USB_FAILED -ne 0 ]; then
|
||||
whiptail $BG_COLOR_ERROR --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." 0 80
|
||||
mount-usb && USB_FAILED=0 || ( [ $? -eq 5 ] && exit 1 || USB_FAILED=1 )
|
||||
if [ $USB_FAILED -ne 0 ]; then
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: Mounting /media Failed' \
|
||||
--msgbox "Unable to mount USB device" 16 60
|
||||
--msgbox "Unable to mount USB device" 0 80
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
@ -79,7 +79,7 @@ file_selector()
|
||||
fi
|
||||
else
|
||||
whiptail $BG_COLOR_ERROR --title 'ERROR: No Files Found' \
|
||||
--msgbox "No Files found matching the pattern. Aborting." 16 60
|
||||
--msgbox "No Files found matching the pattern. Aborting." 0 80
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -99,7 +99,7 @@ show_system_info()
|
||||
kernel=$(uname -s -r)
|
||||
|
||||
whiptail $BG_COLOR_MAIN_MENU --title 'System Info' \
|
||||
--msgbox "${BOARD_NAME}\n\nFW_VER: ${FW_VER}\nKernel: ${kernel}\n\nCPU: ${cpustr}\nRAM: ${memtotal} GB\n$battery_status\n$(fdisk -l | grep -e '/dev/sd.:' -e '/dev/nvme.*:' | sed 's/B,.*/B/')" 16 60
|
||||
--msgbox "${BOARD_NAME}\n\nFW_VER: ${FW_VER}\nKernel: ${kernel}\n\nCPU: ${cpustr}\nRAM: ${memtotal} GB\n$battery_status\n$(fdisk -l | grep -e '/dev/sd.:' -e '/dev/nvme.*:' | sed 's/B,.*/B/')" 0 80
|
||||
}
|
||||
|
||||
# Get "Enable" or "Disable" to display in the configuration menu, based on a
|
||||
|
||||
Loading…
Reference in New Issue
Block a user