From 46eacd7d31636f9649253107f900fcf41b9213ce Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sat, 27 Apr 2024 14:44:51 +0200
Subject: [PATCH] fix: Store legacy bootmode

---
 src/install.sh | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/install.sh b/src/install.sh
index 7ecbb86..e79641f 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -275,20 +275,23 @@ finishInstall() {
     fi
   fi
 
+  rm -f "$STORAGE/windows.ver"
+  rm -f "$STORAGE/windows.old"
   rm -f "$STORAGE/windows.boot"
+  rm -f "$STORAGE/windows.mode"
+
   cp /run/version "$STORAGE/windows.ver"
 
   if [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
     echo "$MACHINE" > "$STORAGE/windows.old"
+    echo "$BOOT_MODE" > "$STORAGE/windows.mode"
   else
-    rm -f "$STORAGE/windows.old"
-  fi
-
-  # Enable secure boot + TPM on manual installs as Win11 requires
-  if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then
-    if [[ "${DETECTED,,}" == "win11"* ]]; then
-      BOOT_MODE="windows_secure"
-      echo "$BOOT_MODE" > "$STORAGE/windows.mode"
+    # Enable secure boot + TPM on manual installs as Win11 requires
+    if [[ "$MANUAL" == [Yy1]* ]] || [[ "$aborted" == [Yy1]* ]]; then
+      if [[ "${DETECTED,,}" == "win11"* ]]; then
+        BOOT_MODE="windows_secure"
+        echo "$BOOT_MODE" > "$STORAGE/windows.mode"
+      fi
     fi
   fi
 
@@ -1151,16 +1154,21 @@ buildImage() {
 
 bootWindows() {
 
-  if [ -f "$STORAGE/windows.old" ]; then
-    MACHINE=$(<"$STORAGE/windows.old")
-    [ -z "$MACHINE" ] && MACHINE="q35"
-    BOOT_MODE="windows_legacy"
+  if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then
+    BOOT_MODE=$(<"$STORAGE/windows.mode")
+    if [ -f "$STORAGE/windows.old" ]; then
+      MACHINE=$(<"$STORAGE/windows.old")
+      [ -z "$MACHINE" ] && MACHINE="q35"
+    fi
     rm -rf "$TMP"
     return 0
   fi
 
-  if [ -s "$STORAGE/windows.mode" ] && [ -f "$STORAGE/windows.mode" ]; then
-    BOOT_MODE=$(<"$STORAGE/windows.mode")
+  if [ -f "$STORAGE/windows.old" ]; then
+    MACHINE=$(<"$STORAGE/windows.old")
+    [ -z "$MACHINE" ] && MACHINE="q35"
+    BOOT_MODE="windows_legacy"
+    echo "$BOOT_MODE" > "$STORAGE/windows.mode"
     rm -rf "$TMP"
     return 0
   fi