Merge branch 'newt_colors' of github.com:mdrobnak/heads

PR 1698

Author: JonathonHall-Purism

Makefile

@@ -175,11 +175,12 @@ endif
 # Create a temporary directory for the initrd
 initrd_dir	:= $(BOARD)
 initrd_tmp_dir	:= $(shell mktemp -d)
+initrd_data_dir	:= $(initrd_tmp_dir)/etc/terminfo/l
 initrd_lib_dir	:= $(initrd_tmp_dir)/lib
 initrd_bin_dir	:= $(initrd_tmp_dir)/bin
 modules-y += initrd
 
-$(shell mkdir -p "$(initrd_lib_dir)" "$(initrd_bin_dir)")
+$(shell mkdir -p "$(initrd_lib_dir)" "$(initrd_bin_dir)" "$(initrd_data_dir)")
 
 # We are running our own version of make,
 # proceed with the build.
@@ -291,13 +292,17 @@ include modules/*
 define bins =
 $(foreach m,$1,$(call prefix,$(build)/$($m_dir)/,$($m_output)))
 endef
+define data =
+$(foreach m,$1,$(call prefix,$(build)/$($m_dir)/,$($m_data)))
+endef
 define libs =
 $(foreach m,$1,$(call prefix,$(build)/$($m_dir)/,$($m_libraries)))
 endef
 
 define outputs =
 $(foreach m,$1,\
 	$(call bins,$m)\
+	$(call data,$m)\
 	$(call libs,$m)\
 )
 endef
@@ -577,6 +582,11 @@ $(initrd_bin_dir)/$(notdir $1): $1
 initrd_bins += $(initrd_bin_dir)/$(notdir $1)
 endef
 
+define initrd_data_add =
+$(initrd_data_dir)/$(notdir $1): $1
+	$(call do,INSTALL-DATA,$$(<:$(pwd)/%=%),cp -a --remove-destination "$$<" "$$@")
+initrd_data += $(initrd_data_dir)/$(notdir $1)
+endef
 
 define initrd_lib_add =
 $(initrd_lib_dir)/$(notdir $1): $1
@@ -622,6 +632,10 @@ $(foreach m, $(bin_modules-y), \
 	$(call map,initrd_bin_add,$(call bins,$m)) \
 )
 
+# Install the data for every module that we have built
+$(foreach m, $(modules-y), \
+	$(call map,initrd_data_add,$(call data,$m)) \
+)
 # Install the libraries for every module that we have built
 $(foreach m, $(modules-y), \
 	$(call map,initrd_lib_add,$(call libs,$m)) \
@@ -727,9 +741,11 @@ $(build)/$(initrd_dir)/heads.cpio: FORCE
 #
 $(build)/$(initrd_dir)/tools.cpio: \
 	$(initrd_bins) \
+	$(initrd_data) \
 	$(initrd_libs) \
 	$(initrd_tmp_dir)/etc/config \
 
+	$(info Used **BINS**: $(initrd_bins))
 	$(call do-cpio,$@,$(initrd_tmp_dir))
 	@$(RM) -rf "$(initrd_tmp_dir)"
 

initrd/bin/config-gui.sh

@@ -15,7 +15,7 @@ param=$1
 read_rom() {
   /bin/flash.sh -r "$1"
   if [ ! -s "$1" ]; then
-    whiptail $BG_COLOR_ERROR --title 'ERROR: BIOS Read Failed!' \
+    whiptail_error --title 'ERROR: BIOS Read Failed!' \
       --msgbox "Unable to read BIOS" 0 80
     exit 1
   fi
@@ -95,7 +95,7 @@ while true; do
     )
 
     unset menu_choice
-    whiptail $BG_COLOR_MAIN_MENU --title "Config Management Menu" \
+    whiptail_type $BG_COLOR_MAIN_MENU --title "Config Management Menu" \
     --menu "This menu lets you change settings for the current BIOS session.\n\nAll changes will revert after a reboot,\n\nunless you also save them to the running BIOS." 0 80 10 \
     "${dynamic_config_options[@]}" \
     2>/tmp/whiptail || recovery "GUI menu failed"
@@ -116,7 +116,7 @@ while true; do
     "b" )
       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' \
+        whiptail_error --title 'ERROR: No bootable devices found' \
           --msgbox "    $ERROR\n\n" 0 80
         exit 1
       fi
@@ -147,7 +147,7 @@ while true; do
       # mount newly selected /boot device
       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' \
+        whiptail_error --title 'ERROR: unable to mount /boot' \
           --msgbox "    $ERROR\n\n" 0 80
         exit 1
       fi
@@ -175,7 +175,7 @@ while true; do
     ;;
     "r" )
       # prompt for confirmation
-      if (whiptail $BG_COLOR_WARNING --title 'Reset Configuration?' \
+      if (whiptail_warning --title 'Reset Configuration?' \
            --yesno "This will clear all GPG keys, clear boot signatures and checksums,
                   \nreset the /boot device, clear/reset the TPM (if present),
                   \nand reflash your BIOS with the cleaned configuration.
@@ -268,7 +268,7 @@ while true; do
       if [ "$CONFIG_ROOT_CHECK_AT_BOOT" != "y" ]; then
         # Root device and directories must be set to enable this
         if [ -z "$CONFIG_ROOT_DEV" ] || [ -z "$CONFIG_ROOT_DIRLIST" ]; then
-          whiptail $BG_COLOR_ERROR --title 'Root Check Not Configured' \
+          whiptail_error --title 'Root Check Not Configured' \
             --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.
@@ -305,7 +305,7 @@ while true; do
     ;;
     "P" )
       if [ "$CONFIG_RESTRICTED_BOOT" = "y" ]; then
-          whiptail $BG_COLOR_ERROR --title 'Restricted Boot Active' \
+          whiptail_error --title 'Restricted Boot Active' \
             --msgbox "Disable Restricted Boot to enable Basic Mode." 0 80
       elif [ "$CONFIG_BASIC" != "y" ]; then
         if (whiptail --title "Enable $CONFIG_BRAND_NAME Basic Mode?" \
@@ -365,7 +365,7 @@ while true; do
           # disabled.
           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' \
+            whiptail_error --title 'ERROR: erasing TOTP secret' \
               --msgbox "Erasing TOTP Secret Failed\n\n${ERROR}" 0 80
             exit 1
           fi

initrd/bin/flash-gui.sh

@@ -8,7 +8,7 @@ set -e -o pipefail
 TRACE_FUNC
 
 if [ "$CONFIG_RESTRICTED_BOOT" = y ]; then
-  whiptail $BG_COLOR_ERROR --title 'Restricted Boot Active' \
+  whiptail_error --title 'Restricted Boot Active' \
     --msgbox "Disable Restricted Boot to flash new firmware." 0 80
   exit 1
 fi
@@ -42,7 +42,7 @@ single_glob() {
 
 while true; do
   unset menu_choice
-  whiptail $BG_COLOR_MAIN_MENU --title "Firmware Management Menu" \
+  whiptail_type $BG_COLOR_MAIN_MENU --title "Firmware Management Menu" \
     --menu "Select the firmware function to perform\n\nRetaining settings copies existing settings to the new firmware:\n* Keeps your GPG keyring\n* Keeps changes to the default /boot device\n\nErasing settings uses the new firmware as-is:\n* Erases any existing GPG keyring\n* Restores firmware to default factory settings\n* Clears out /boot signatures\n\nIf you are just updating your firmware, you probably want to retain\nyour settings." 0 80 10 \
     'f' ' Flash the firmware with a new ROM, retain settings' \
     'c' ' Flash the firmware with a new ROM, erase settings' \
@@ -56,7 +56,7 @@ while true; do
     exit 0
     ;;
   f | c)
-    if (whiptail $BG_COLOR_WARNING --title 'Flash the BIOS with a new ROM' \
+    if (whiptail_warning --title 'Flash the BIOS with a new ROM' \
       --yesno "You will need to insert a USB drive containing your BIOS image (*.zip or\n*.$UPDATE_PLAIN_EXT).\n\nAfter you select this file, this program will reflash your BIOS.\n\nDo you want to proceed?" 0 80); then
       mount_usb
       if grep -q /media /proc/mounts; then
@@ -115,7 +115,7 @@ while true; do
             exit 1
           fi
 
-          if ! whiptail $BG_COLOR_WARNING --title 'Flash ROM?' \
+          if ! whiptail_warning --title 'Flash ROM?' \
             --yesno "This will replace your current ROM with:\n\n$PKG_FILE_DISPLAY\n\nDo you want to proceed?" 0 80; then
             exit 1
           fi
@@ -136,7 +136,7 @@ while true; do
             fi
             ROM="$PKG_EXTRACT/$(basename "$PKG_FILE")"
             ROM_HASH=$(sha256sum "$ROM" | awk '{print $1}')
-            if ! (whiptail $CONFIG_ERROR_BG_COLOR --title 'Flash ROM without integrity check?' \
+            if ! (whiptail_error --title 'Flash ROM without integrity check?' \
               --yesno "You have provided a *.$UPDATE_PLAIN_EXT file. The integrity of the file can not be\nchecked automatically for this file type.\n\nROM: $PKG_FILE_DISPLAY\nSHA256SUM: $ROM_HASH\n\nIf you do not know how to check the file integrity yourself,\nyou should use a *.zip file instead.\n\nIf the file is damaged, you will not be able to boot anymore.\nDo you want to proceed flashing without file integrity check?" 0 80); then
               exit 1
             fi

initrd/bin/gpg-gui.sh

@@ -65,7 +65,7 @@ gpg_flash_rom() {
   if (whiptail --title 'BIOS Flashed Successfully' \
       --yesno "Would you like to update the checksums and sign all of the files in /boot?\n\nYou will need your GPG key to continue and this will modify your disk.\n\nOtherwise the system will reboot immediately." 0 80) then
     if ! update_checksums ; then
-      whiptail $BG_COLOR_ERROR --title 'ERROR' \
+      whiptail_error --title 'ERROR' \
         --msgbox "Failed to update checksums / sign default config" 0 80
     fi
   else
@@ -89,7 +89,7 @@ gpg_post_gen_mgmt() {
       whiptail --title "The GPG Key Copied Successfully" \
         --msgbox "${GPG_GEN_KEY}.asc copied successfully." 0 80
     else
-      whiptail $BG_COLOR_ERROR --title 'ERROR: Copy Failed' \
+      whiptail_error --title 'ERROR: Copy Failed' \
         --msgbox "Unable to copy ${GPG_GEN_KEY}.asc to /media" 0 80
     fi
     umount /media
@@ -98,7 +98,7 @@ gpg_post_gen_mgmt() {
       --yesno "Would you like to add the GPG public key you generated to the BIOS?\n\nThis makes it a trusted key used to sign files in /boot\n\n" 0 80) then
       /bin/flash.sh -r /tmp/gpg-gui.rom
       if [ ! -s /tmp/gpg-gui.rom ]; then
-        whiptail $BG_COLOR_ERROR --title 'ERROR: BIOS Read Failed!' \
+        whiptail_error --title 'ERROR: BIOS Read Failed!' \
           --msgbox "Unable to read BIOS" 0 80
         exit 1
       fi
@@ -124,7 +124,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!' \
+        whiptail_error --title 'ERROR: BIOS Read Failed!' \
           --msgbox "Unable to read BIOS" 0 80
         exit 1
       fi
@@ -141,7 +141,7 @@ gpg_add_key_reflash() {
 
 while true; do
   unset menu_choice
-  whiptail $BG_COLOR_MAIN_MENU --title "GPG Management Menu" \
+  whiptail_type $BG_COLOR_MAIN_MENU --title "GPG Management Menu" \
     --menu 'Select the GPG function to perform' 0 80 10 \
     'r' ' Add GPG key to running BIOS and reflash' \
     'a' ' Add GPG key to standalone BIOS image and flash' \
@@ -181,7 +181,7 @@ while true; do
           fi
           cp "$ROM" /tmp/gpg-gui.rom
 
-          if (whiptail $BG_COLOR_WARNING --title 'Flash ROM?' \
+          if (whiptail_warning --title 'Flash ROM?' \
               --yesno "This will replace your old ROM with $ROM\n\nDo you want to proceed?" 0 80) then
             gpg_flash_rom
           else
@@ -218,7 +218,7 @@ while true; do
           whiptail --title "The GPG Key Copied Successfully" \
             --msgbox "public-key.asc copied successfully." 0 80
         else
-          whiptail $BG_COLOR_ERROR --title 'ERROR: Copy Failed' \
+          whiptail_error --title 'ERROR: Copy Failed' \
             --msgbox "Unable to copy public-key.asc to /media" 0 80
         fi
         umount /media