From 8f28565dc95e34f30bbe2a71ee0a7e50dcb70837 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:49:06 +0100
Subject: [PATCH] Update boot.sh

---
 src/boot.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/boot.sh b/src/boot.sh
index b8e12e2..1a5cb36 100644
--- a/src/boot.sh
+++ b/src/boot.sh
@@ -4,34 +4,30 @@ set -Eeuo pipefail
 # Docker environment variables
 : "${TPM:="Y"}"         # Enable TPM
 : "${BOOT_MODE:="legacy"}"  # Boot mode
+: "${BIOS:="QEMU,VGA.bin"}" # Bios file
 
 SECURE=""
-BOOT_OPTS=""
-BIOS="QEMU,VGA.bin"
 DIR="/usr/share/qemu"
+BOOT_OPTS="-device ramfb"
 
 case "${BOOT_MODE,,}" in
   uefi)
-    BIOS="QEMU,VGA.bin"
     ROM="AAVMF_CODE.fd"
     VARS="AAVMF_VARS.fd"
     ;;
   secure)
-    BIOS="QEMU,VGA.bin"
     ROM="AAVMF_CODE.fd"
     VARS="AAVMF_VARS.fd"
     ;;
   windows)
-    BIOS="QEMU,VGA.bin"
     ROM="AAVMF_CODE.ms.fd"
     VARS="AAVMF_VARS.ms.fd"
     ;;
   windows_legacy)
     USB="usb-ehci,id=ehci"
-    BOOT_OPTS=""
     ;;
   legacy)
-    BOOT_OPTS=""
+    SECURE=""
     ;;
   *)
     info "Unknown boot mode '${BOOT_MODE}', defaulting to 'legacy'"
@@ -39,10 +35,11 @@ case "${BOOT_MODE,,}" in
     ;;
 esac
 
-BOOT_OPTS="$BOOT_OPTS -device ramfb"
-[ -n "$BIOS" ] && BOOT_OPTS="$BOOT_OPTS -bios $DIR/$BIOS"
+if [[ "${BOOT_MODE,,}" == "legacy" ]] || [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
 
-if [[ "${BOOT_MODE,,}" != "legacy" ]] && [[ "${BOOT_MODE,,}" != "windows_legacy" ]]; then
+  BOOT_OPTS="$BOOT_OPTS -bios $DIR/$BIOS"
+
+else
 
   AAVMF="/usr/share/AAVMF/"
   DEST="$STORAGE/${BOOT_MODE,,}"