make rootless

diff --git a/Makefile b/Makefile
index 4e7ca340ea9fe5f4815951a18ab7d0bec3981925..d65e981117aab15a22295a8d4be9bb90932c598f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,12 +11,7 @@ stage2/target/x86-loadnothing/release/stage2: stage2/src/main.rs
        cd stage2 && cargo build --release
 
 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%
-       doas losetup /dev/loop1 nothing.img
-       doas mkfs.fat /dev/loop1p1
-       doas losetup -d /dev/loop1
+       cp -p base.img nothing.img
        dd if=stage1/boot.bin of=nothing.img bs=1 count=446 conv=notrunc
        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

diff --git a/base.img b/base.img
new file mode 100644 (file)
index 0000000..c7e6627
Binary files /dev/null and b/base.img differ