flash-gui.sh: single prompt for non npf file showing hash of rom file, correcting whiptail window size to be automatic, not fixed

Author: tlaurion

initrd/bin/flash-gui.sh

@@ -33,7 +33,7 @@ while true; do
     ;;
   f | c)
     if (whiptail $BG_COLOR_WARNING --title 'Flash the BIOS with a new ROM' \
-      --yesno "You will need to insert a USB drive containing your BIOS image (*.rom or *.tgz).\n\nAfter you select this file, this program will reflash your BIOS.\n\nDo you want to proceed?" 0 80); then
+      --yesno "You will need to insert a USB drive containing your BIOS image (*.rom, *.npf or *.tgz).\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
         find /media ! -path '*/\.*' -type f \( -name '*.rom' -o -name '*.tgz' -o -type f -name '*.npf' \) | sort >/tmp/filelist.txt
@@ -60,41 +60,34 @@ while true; do
             exit
           fi
         else
-          # exit if we shall not proceed
+          # a rom file is provided. exit if we shall not proceed
+          ROM_HASH=$(sha256sum "$ROM" | awk '{print $1}') || die "Failed to hash ROM file"
           if ! (whiptail $CONFIG_ERROR_BG_COLOR --title 'Flash ROM without integrity check?' \
-            --yesno "You have provided a *.rom file. The integrity of the file can not be\nchecked automatically for this file.\nIf you do not know how to check the file integrity yourself,\nyou should use a *.npf 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?" 16 60); then
+            --yesno "You have provided a *.rom file. The integrity of the file can not be\nchecked automatically for this file.\n\nROM: $ROM\nSHA256SUM: $ROM_HASH\n\nIf you do not know how to check the file integrity yourself,\nyou should use a *.npf 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
-          fi
+          else
+            # then user validated sha256sum manually from has on screen
+            ROM_INTEGRITY_VERIFIED=1
+          fi  
+        fi
+        
+	if [ "$ROM_INTEGRITY_VERIFIED" == "1" ]; then
+          /bin/flash.sh -c -i "$ROM"
+        else
+          /bin/flash.sh -c "$ROM"
         fi
 
-        if (whiptail $BG_COLOR_WARNING --title 'Flash ROM?' \
-          --yesno "This will replace your current ROM with:\n\n${ROM#"/media/"}\n\nDo you want to proceed?" 0 80); then
-          if [ "$menu_choice" == "c" ]; then
-            # flag is passed to flash.sh to erase settings while stating if rom is verified or not
-            if [ "$ROM_INTEGRITY_VERIFIED" == "1" ]; then
-              /bin/flash.sh -c -i "$ROM"
-            else
-              /bin/flash.sh -c "$ROM"
-            fi
+        # after flash, /boot signatures are now invalid so go ahead and clear them
+        if ls /boot/kexec* >/dev/null 2>&1; then
+          (
+            mount -o remount,rw /boot 2>/dev/null
+            rm /boot/kexec* 2>/dev/null
+            mount -o remount,ro /boot 2>/dev/null
+          )
+        fi
 
-            # after flash, /boot signatures are now invalid so go ahead and clear them
-            if ls /boot/kexec* >/dev/null 2>&1; then
-              (
-                mount -o remount,rw /boot 2>/dev/null
-                rm /boot/kexec* 2>/dev/null
-                mount -o remount,ro /boot 2>/dev/null
-              )
-            fi
-          else
-            if [ "$ROM_INTEGRITY_VERIFIED" == "1" ]; then
-              # flag is passed to flash.sh to retain settings while stating if rom is verified or not
-              /bin/flash.sh "$ROM" -i
-            else
-              /bin/flash.sh "$ROM"
-            fi
-          fi
-          whiptail --title 'ROM Flashed Successfully' \
-            --msgbox "${ROM#"/media/"}\n\nhas been flashed successfully.\n\nPress Enter to reboot\n" 0 80
+        if (whiptail --title 'ROM Flashed Successfully' \
+          --msgbox "${ROM#"/media/"}\n\nhas been flashed successfully.\n\nPress Enter to reboot\n" 0 80); then
           umount /media
           /bin/reboot
         else