From f118139a028a237503f7807c5e60b00d737c4ae8 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 26 May 2024 13:25:41 +0200
Subject: [PATCH] Update disk.sh

---
 src/disk.sh | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 94f1942..2676a18 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -514,25 +514,22 @@ case "${DISK_TYPE,,}" in
   * ) error "Invalid DISK_TYPE, value \"$DISK_TYPE\" is unrecognized!" && exit 80 ;;
 esac
 
-DRIVER_TYPE="ide"
-MEDIA_TYPE="$DISK_TYPE"
-
-case "${MACHINE,,}" in
-  "virt" )
-    DRIVER_TYPE="usb" ;;
-  "pc-q35-2"* )
-    DISK_TYPE="blk"
-    MEDIA_TYPE="ide" ;;
-esac
-
 if [ -f "$BOOT" ] && [ -s "$BOOT" ]; then
+  MEDIA_TYPE="$DISK_TYPE"
+  if [ -z "${BOOT_MODE:-}" ] || [[ "${BOOT_MODE:-}" == *"legacy" ]]; then
+    if [[ "${MACHINE,,}" != "virt" ]] && [[ "${MEDIA_TYPE,,}" ==  "blk" ]]; then
+      MEDIA_TYPE="ide"
+    fi
+  fi
   DISK_OPTS=$(addMedia "$BOOT" "$MEDIA_TYPE" "0" "$BOOT_INDEX" "0x5")
 fi
 
+DRIVER_TYPE="ide"
 DRIVERS="/drivers.iso"
 [ ! -f "$DRIVERS" ] || [ ! -s "$DRIVERS" ] && DRIVERS="$STORAGE/drivers.iso"
 
 if [ -f "$DRIVERS" ] && [ -s "$DRIVERS" ]; then
+  [[ "${MACHINE,,}" ==  "virt" ]] && DRIVER_TYPE="usb"
   DRIVER_OPTS=$(addMedia "$DRIVERS" "$DRIVER_TYPE" "1" "" "0x6")
   DISK_OPTS="$DISK_OPTS $DRIVER_OPTS"
 fi
@@ -609,4 +606,5 @@ fi
 DISK_OPTS="$DISK_OPTS -object iothread,id=io2"
 
 html "Initialized disks successfully..."
+
 return 0