1 files changed, 10 insertions, 10 deletions

diff --git a/scripts/test-disk.sh b/scripts/test-disk.sh
index 0268fff..9ffb3c8 100755
--- a/scripts/test-disk.sh
+++ b/scripts/test-disk.sh
@@ -26,7 +26,7 @@ FRESH=0
 
 OVMF="${OVMF:-/usr/share/edk2/x64/OVMF.4m.fd}"
 QEMU="${QEMU:-qemu-system-x86_64}"
-IMG="${DISK_IMG:-/tmp/disk.img}"
+IMG="${SYSTEM_IMG:-/tmp/system.img}"
 ESP_DIR="$PROJECT_DIR/esp"
 QPID=/tmp/rsdos-test-qpid
 SOCK=/tmp/rsdos-test-qmon.sock
@@ -69,29 +69,29 @@ wait_qemu_exit() {
 echo "==> 1/6 build kernel (debug)"
 cargo build --package rsdos --target x86_64-unknown-uefi
 
-echo "==> 2/6 deploy to ESP + ensure disk image"
-mkdir -p "$ESP_DIR/EFI/BOOT"
-cp target/x86_64-unknown-uefi/debug/rsdos.efi "$ESP_DIR/EFI/BOOT/BOOTX64.EFI"
+echo "==> 2/6 ensure system image"
 if [ "$FRESH" -eq 1 ]; then
-        "$SCRIPT_DIR/mkdisk.sh" --fresh "$IMG"
+        "$SCRIPT_DIR/mksystem.sh" --force "$IMG"
 else
-        "$SCRIPT_DIR/mkdisk.sh" "$IMG"
+        "$SCRIPT_DIR/mksystem.sh" "$IMG"
 fi
 
 echo "==> 3/6 boot QEMU (headless)"
 kill "$(cat "$QPID" 2>/dev/null)" 2>/dev/null || true
 sleep 1
 rm -f "$SOCK" "$LOG"
-"$QEMU" -bios "$OVMF" \
+# Throwaway OVMF varstore: a stale/poisoned NvVars (e.g. left by the old
+# vvfat setup) makes the firmware skip the \EFI\BOOT fallback entirely.
+NV="/tmp/rsdos-test-ovmf-vars.fd"
+rm -f "$NV"
+cp /usr/share/edk2/x64/OVMF.4m.fd "$NV"
+"$QEMU" -bios "$NV" \
         -drive file="$IMG",format=raw,if=none,id=disk \
         -device ide-hd,drive=disk,bus=ide.0 \
-        -drive file=fat:rw:"$ESP_DIR",format=raw,if=none,id=esp \
-        -device ide-hd,drive=esp,bus=ide.1 \
         -serial file:"$LOG" \
         -monitor unix:"$SOCK",server,nowait \
         -m 256M -machine q35 -cpu qemu64 -no-reboot -display none \
         >"$QLOG" 2>&1 &
-echo $! >"$QPID"
 
 wait_log "$LOG" "boot: entering shell" 90 || fail "kernel never reached the shell"
 sleep 1