diff --git a/.gitignore b/.gitignore index 40d4b7ae..90fe30bc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ *.img *.d *.out -bootloader/sectors.asm -commands \ No newline at end of file +commands +mnt \ No newline at end of file diff --git a/Makefile b/Makefile index 6d52ee3f..869d3213 100644 --- a/Makefile +++ b/Makefile @@ -24,18 +24,19 @@ programs/loop/a.out: force_look cd programs/loop; ${MAKE} a.out thor.flp: bootloader/stage1.bin bootloader/stage2.bin kernel/kernel.bin programs/one/a.out programs/hello/a.out programs/long/a.out programs/loop/a.out + mkdir -p mnt/fake/ dd if=bootloader/stage1.bin of=hdd.img conv=notrunc dd if=bootloader/stage2.bin of=hdd.img seek=1 conv=notrunc sudo /sbin/losetup -o1048576 /dev/loop0 hdd.img sudo /usr/sbin/mkdosfs -F32 /dev/loop0 - sudo /bin/mount -t vfat /dev/loop0 /mnt/fake_cdrom/ - sudo /bin/cp kernel/kernel.bin /mnt/fake_cdrom/ - sudo /bin/cp programs/one/a.out /mnt/fake_cdrom/one - sudo /bin/cp programs/hello/a.out /mnt/fake_cdrom/hello - sudo /bin/cp programs/long/a.out /mnt/fake_cdrom/long - sudo /bin/cp programs/loop/a.out /mnt/fake_cdrom/loop + sudo /bin/mount -t vfat /dev/loop0 mnt/fake/ + sudo /bin/cp kernel/kernel.bin mnt/fake/ + sudo /bin/cp programs/one/a.out mnt/fake/one + sudo /bin/cp programs/hello/a.out mnt/fake/hello + sudo /bin/cp programs/long/a.out mnt/fake/long + sudo /bin/cp programs/loop/a.out mnt/fake/loop sleep 0.1 - sudo /bin/umount /mnt/fake_cdrom/ + sudo /bin/umount mnt/fake/ sudo /sbin/losetup -d /dev/loop0 qemu: default