From df3b8dfc0cf7428c5cd1655ad5663f60c70e87a5 Mon Sep 17 00:00:00 2001
From: Elaina Claus <elaina.claus@chtm.me>
Date: Fri, 11 Oct 2024 13:09:17 -0400
Subject: [PATCH] fix passing stage2 wrong data for boot drive

---
 src/stage2/stage2.nasm | 4 +---
 src/vbr/vbr.nasm       | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/stage2/stage2.nasm b/src/stage2/stage2.nasm
index e755639..fb59ec1 100755
--- a/src/stage2/stage2.nasm
+++ b/src/stage2/stage2.nasm
@@ -361,9 +361,7 @@ NewLine_cstr:
 BootTarget_str:
     db "BOOT    BIN"
 boot_drive_ptr:
-    db 0x00
-stage2_resb_1:
-    db 0x00
+    dw 0x0000
 partition_offset_ptr:
     dw 0x0000
 
diff --git a/src/vbr/vbr.nasm b/src/vbr/vbr.nasm
index c630f6f..95101a3 100755
--- a/src/vbr/vbr.nasm
+++ b/src/vbr/vbr.nasm
@@ -136,8 +136,8 @@ main:
     ERROR VBR_ERROR_NO_SIGNATURE          ; no signature present in stage2
     
 .sig_ok:
-    mov si, [bp - 4]
-    mov dx, [bp - 2]
+    mov si, word [bp - 4]
+    mov dl, byte [bp - 2]
     jmp 0:0x7E00
 
 ; ###############