Revert "echo boot signature directly into image"

This reverts commit d63c4d1b58753444cb521c62928861b18f5dcc05.

diff --git a/Makefile b/Makefile
index de3bd9d01f06656368b7fa120cc77c2ff565fb70..4e7ca340ea9fe5f4815951a18ab7d0bec3981925 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,13 @@ default_target: vm
 stage1/boot.bin: stage1/boot.asm
        nasm -DSTAGE2SIZE=$$(du -b stage2/target/x86-loadnothing/release/stage2 | cut -f1) -f bin -o stage1/boot.bin stage1/boot.asm
 
+magic.bin:
+       echo -en "\x55\xAA" > magic.bin
+
 stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs
        cd stage2 && cargo build --release
 
-nothing.img: stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
+nothing.img: magic.bin stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
        dd if=/dev/zero of=nothing.img bs=32M count=1
        parted -s nothing.img mklabel msdos
        parted -s -a optimal nothing.img mkpart primary fat32 16MiB 100%
@@ -15,7 +18,7 @@ nothing.img: stage2/target/x86-loadnothing/release/stage2 stage1/boot.bin
        doas mkfs.fat /dev/loop1p1
        doas losetup -d /dev/loop1
        dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
-       echo -en "\x55\xAA" >> nothing.img
+       dd if=magic.bin of=nothing.img bs=1 seek=510 count=2 conv=notrunc
        dd if=stage2/target/x86-loadnothing/release/stage2 of=nothing.img bs=512 seek=1 conv=notrunc
 
 vm: nothing.img