RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 10:37:45 +00:00
Code Issues Activity Actions

Kernel: Use a multiboot header instead of a convoluted two-part bootloader.

Browse source 
The old bootloader was hilariously complicated, requiring a floppy disk with
the kernel on it, and a hard drive with the file system. This patch removes
the floppy disk from the equation and replaces it with a multiboot header.
This means the kernel can now be booted with qemu-system-i386 -kernel kernel
This commit is contained in:
Andreas Kling 2019-04-01 21:43:07 +02:00
parent d5a9f4596b
commit ee4d7c18c8
7 changed files with 81 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/run
View file

@ -7,17 +7,17 @@ if [ "$1" = "b" ]; then
bochs -q -f .bochsrc
elif [ "$1" = "qn" ]; then
# ./run qn: qemu without network
qemu-system-i386 -s -m $ram_size -device e1000 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents #$@
qemu-system-i386 -s -m $ram_size -device e1000 -kernel kernel -hda _fs_contents
elif [ "$1" = "qtap" ]; then
# ./run qtap: qemu with tap
sudo qemu-system-i386 -s -m $ram_size -object filter-dump,id=hue,netdev=br0,file=e1000.pcap -netdev tap,ifname=tap0,id=br0 -device e1000,netdev=br0 -drive format=raw,file=.floppy-image,if=floppy -drive format=raw,file=_fs_contents
sudo qemu-system-i386 -s -m $ram_size -object filter-dump,id=hue,netdev=br0,file=e1000.pcap -netdev tap,ifname=tap0,id=br0 -device e1000,netdev=br0 -kernel kernel -hda _fs_contents
else
# ./run: qemu with user networking
qemu-system-i386 -s -m $ram_size \
-object filter-dump,id=hue,netdev=breh,file=e1000.pcap \
-netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-192.168.5.2:8888 \
-device e1000,netdev=breh \
-drive format=raw,file=.floppy-image,if=floppy \
-drive format=raw,file=_fs_contents
-kernel kernel \
-hda _fs_contents
fi