config-gui.sh: Fix refactors, simplify implementation more

Stop manually loading config values, just update config in environment.

Never test values against "n", since many default to empty.  Always
test ="y" or !="y", any other value is off.

Add set_user_config() function to set a value in config.user,
combine configs, and update config in environment.  Use it in setting
implementations.

Remove toggle_config, it wasn't very useful because the settings still
test y/n in order to show specific confirmation and success messages.

Signed-off-by: Jonathon Hall <jonathon.hall@puri.sm>

initrd/bin/config-gui.sh

@@ -27,47 +27,40 @@ while true; do
     menu_choice=${param::1}
     unset param
   else
-    # check current PureBoot Mode
+    # Re-source config because we change it when an option is toggled
-    BASIC_MODE="$(load_config_value CONFIG_PUREBOOT_BASIC)"
+    . /tmp/config
-    # check current Restricted Boot Mode
-    RESTRICTED_BOOT="$(load_config_value CONFIG_RESTRICTED_BOOT)"
-    # check current state of blob jail
-    USE_JAIL="$(load_config_value CONFIG_USE_BLOB_JAIL)"
-    AUTOMATIC_POWERON="$(load_config_value CONFIG_AUTOMATIC_POWERON)"
-    BASIC_NO_AUTOMATIC_DEFAULT="$(load_config_value CONFIG_BASIC_NO_AUTOMATIC_DEFAULT)"
-    BASIC_USB_AUTOBOOT="$(load_config_value CONFIG_BASIC_USB_AUTOBOOT)"
 
     dynamic_config_options=()
 
     # Options that don't apply to basic mode
-    [ "$BASIC_MODE" != "y" ] && dynamic_config_options+=(
+    [ "$CONFIG_PUREBOOT_BASIC" != "y" ] && dynamic_config_options+=(
         'r' ' Clear GPG key(s) and reset all user settings'
         'R' ' Change the root device for hashing'
         'D' ' Change the root directories to hash'
         'B' ' Check root hashes at boot'
-        'L' " $(get_config_display_action "$RESTRICTED_BOOT") Restricted Boot"
+        'L' " $(get_config_display_action "$CONFIG_RESTRICTED_BOOT") Restricted Boot"
     )
 
-    # Basic itself is always available
+    # Basic itself is always available (though RB will refuse to enable it)
     dynamic_config_options+=(
-        'P' " $(get_config_display_action "$BASIC_MODE") PureBoot Basic Mode"
+        'P' " $(get_config_display_action "$CONFIG_PUREBOOT_BASIC") PureBoot Basic Mode"
     )
 
     # Blob jail is only offered if this is a configuration with the blobs in
     # firmware
     [ "$CONFIG_SUPPORT_BLOB_JAIL" = "y" ] && dynamic_config_options+=(
-        'J' " $(get_config_display_action "$USE_JAIL") Firmware Blob Jail"
+        'J' " $(get_config_display_action "$CONFIG_USE_BLOB_JAIL") Firmware Blob Jail"
     )
 
     # Basic-only options for automatic boot
-    [ "$BASIC_MODE" = "y" ] && dynamic_config_options+=(
+    [ "$CONFIG_PUREBOOT_BASIC" = "y" ] && dynamic_config_options+=(
-        'A' " $(get_inverted_config_display_action "$BASIC_NO_AUTOMATIC_DEFAULT") automatic default boot"
+        'A' " $(get_inverted_config_display_action "$CONFIG_BASIC_NO_AUTOMATIC_DEFAULT") automatic default boot"
-        'U' " $(get_config_display_action "$BASIC_USB_AUTOBOOT") USB automatic boot"
+        'U' " $(get_config_display_action "$CONFIG_BASIC_USB_AUTOBOOT") USB automatic boot"
     )
 
     # Automatic power on - requires board support
     [ "$CONFIG_SUPPORT_AUTOMATIC_POWERON" = "y" ] && dynamic_config_options+=(
-        'N' " $(get_config_display_action "$AUTOMATIC_POWERON") Automatic Power-On"
+        'N' " $(get_config_display_action "$CONFIG_AUTOMATIC_POWERON") automatic power-on"
     )
 
     unset menu_choice
@@ -269,17 +262,16 @@ while true; do
       fi
     ;;
     "P" )
-      if ! [ "$RESTRICTED_BOOT" = n ]; then
+      if [ "$CONFIG_RESTRICTED_BOOT" = "y" ]; then
           whiptail $BG_COLOR_ERROR --title 'Restricted Boot Active' \
             --msgbox "Disable Restricted Boot to enable Basic Mode." 0 80
-      elif [ "$BASIC_MODE" = "n" ]; then
+      elif [ "$CONFIG_PUREBOOT_BASIC" != "y" ]; then
         if (whiptail --title 'Enable PureBoot Basic Mode?' \
              --yesno "This will remove all signature checking on the firmware
                     \nand boot files, and disable use of the Librem Key.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_PUREBOOT_BASIC" "y"
+          set_user_config "CONFIG_PUREBOOT_BASIC" "y"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "PureBoot Basic mode enabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -291,8 +283,7 @@ while true; do
                     \nand boot files, and enable use of the Librem Key.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_PUREBOOT_BASIC" "n"
+          set_user_config "CONFIG_PUREBOOT_BASIC" "n"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "PureBoot Basic mode has been disabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -300,7 +291,7 @@ while true; do
       fi
     ;;
     "L" )
-      if [ "$RESTRICTED_BOOT" = "n" ]; then
+      if [ "$CONFIG_RESTRICTED_BOOT" != "y" ]; then
         if (whiptail --title 'Enable Restricted Boot Mode?' \
              --yesno "This will disable booting from any unsigned files,
                     \nincluding kernels that have not yet been signed,
@@ -309,8 +300,7 @@ while true; do
                     \n\nThis will also disable the recovery console.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_RESTRICTED_BOOT" "y"
+          set_user_config "CONFIG_RESTRICTED_BOOT" "y"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "Restricted Boot mode enabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -355,13 +345,12 @@ while true; do
       fi
     ;;
     "J" )
-      if [ "$USE_JAIL" = "n" ]; then
+      if [ "$CONFIG_USE_BLOB_JAIL" != "y" ]; then
         if (whiptail --title 'Enable Firmware Blob Jail?' \
              --yesno "This will enable loading of firmware from flash on each boot
                     \n\nDo you want to proceed?" 0 80) then
 
-          toggle_config /etc/config.user "CONFIG_USE_BLOB_JAIL"
+          set_user_config "CONFIG_USE_BLOB_JAIL" "y"
-          combine_configs
 
           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
@@ -371,8 +360,8 @@ while true; do
         if (whiptail --title 'Disable Firmware Blob Jail?' \
              --yesno "This will disable loading of firmware from flash on each boot.
                     \n\nDo you want to proceed?" 0 80) then
-          toggle_config /etc/config.user "CONFIG_USE_BLOB_JAIL"
+
-          combine_configs
+          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." 0 80
@@ -380,15 +369,14 @@ while true; do
       fi
     ;;
     "A" )
-      if [ "$BASIC_NO_AUTOMATIC_DEFAULT" = "n" ]; then
+      if [ "$CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" != "y" ]; then
         if (whiptail --title 'Disable automatic default boot?' \
              --yesno "You will need to select a default boot option.
                     \nIf the boot options are changed, such as for an OS update,
                     \nyou will be prompted to select a new default.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "y"
+          set_user_config "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "y"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "Automatic default boot disabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -398,8 +386,7 @@ while true; do
              --yesno "The first boot option will be used automatically.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "n"
+          set_user_config "CONFIG_BASIC_NO_AUTOMATIC_DEFAULT" "n"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "Automatic default boot enabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -407,14 +394,13 @@ while true; do
       fi
     ;;
     "U" )
-      if [ "$BASIC_USB_AUTOBOOT" = "n" ]; then
+      if [ "$CONFIG_BASIC_USB_AUTOBOOT" != "y" ]; then
         if (whiptail --title 'Enable USB automatic boot?' \
              --yesno "During boot, an attached bootable USB disk will be booted
                     \nby default instead of the installed operating system.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_BASIC_USB_AUTOBOOT" "y"
+          set_user_config "CONFIG_BASIC_USB_AUTOBOOT" "y"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "USB automatic boot enabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -424,8 +410,7 @@ while true; do
              --yesno "USB disks will no longer be booted by default.
                     \n\nDo you want to proceed?" 0 80) then
 
-          set_config /etc/config.user "CONFIG_BASIC_USB_AUTOBOOT" "n"
+          set_user_config "CONFIG_BASIC_USB_AUTOBOOT" "n"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "USB automatic boot disabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -433,13 +418,12 @@ while true; do
       fi
     ;;
     "N" )
-      if [ "$AUTOMATIC_POWERON" = "n" ]; then
+      if [ "$CONFIG_AUTOMATIC_POWERON" != "y" ]; then
         if (whiptail --title 'Enable automatic power-on?' \
              --yesno "The system will boot automatically when power is applied.
                     \n\nDo you want to proceed?" 0 80) then
 
-          toggle_config /etc/config.user "CONFIG_AUTOMATIC_POWERON"
+          set_user_config "CONFIG_AUTOMATIC_POWERON" "y"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "Automatic power-on enabled;\nsave the config change and reboot for it to go into effect." 0 80
@@ -449,8 +433,7 @@ while true; do
              --yesno "The system will stay off when power is applied.
                     \n\nDo you want to proceed?" 0 80) then
 
-          toggle_config /etc/config.user "CONFIG_AUTOMATIC_POWERON"
+          set_user_config "CONFIG_AUTOMATIC_POWERON" "n"
-          combine_configs
 
           whiptail --title 'Config change successful' \
             --msgbox "Automatic power-on disabled;\nsave the config change and reboot for it to go into effect." 0 80

initrd/etc/functions

@@ -314,24 +314,8 @@ replace_config() {
 	rm -f ${CONFIG_FILE}.tmp
 }
 
-invert_yn() {
+# Set a config variable in a specific file to a given value - replace it if it
-	if [ "$1" = "y" ]; then
+# exists, or add it.  If added, the variable will be exported.
-		echo "n"
-	else
-		echo "y"
-	fi
-}
-
-toggle_config() {
-	CONFIG_FILE="$1"
-	CONFIG_OPTION="$2"
-
-	NEW_SETTING="$(invert_yn "$(load_config_value "$CONFIG_OPTION")")"
-	set_config "$CONFIG_FILE" "$CONFIG_SETTING" "$NEW_SETTING"
-}
-
-# Set a config variable to a given value - replace it if it exists, or add it.
-# If added, the variable will be exported.
 set_config() {
 	CONFIG_FILE="$1"
 	CONFIG_OPTION="$2"
@@ -344,6 +328,17 @@ set_config() {
 	fi
 }
 
+# Set a value in config.user, re-combine configs, and update configs in the
+# environment.
+set_user_config() {
+	CONFIG_OPTION="$1"
+	NEW_SETTING="$2"
+
+	set_config /etc/config.user "$CONFIG_OPTION" "$NEW_SETTING"
+	combine_configs
+	. /tmp/config
+}
+
 # Load a config value to a variable, defaulting to 'n'
 load_config_value()
 {