beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Meta: move Kernel/.bochsrc => Meta/bochsrc

Browse source 
The run script is not in Kernel/ anymore, let's move `.bochsrc` in Meta/
so that it can be used with the new build system.

Also make bochs use `grub_disk_image` instead of `_disk_image`
This commit is contained in:
Emanuele Torre 2020-06-24 04:00:02 +02:00 committed by Andreas Kling
parent 86685623a2
commit aabb482d5c
Notes: sideshowbarker 2024-07-19 05:17:14 +09:00 
Author: https://github.com/emanuele6
Commit: https://github.com/SerenityOS/serenity/commit/aabb482d5c6
Pull-request: https://github.com/SerenityOS/serenity/pull/2617
Reviewed-by: https://github.com/bugaevc
Reviewed-by: https://github.com/ericonr
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Kernel/.bochsrc → Meta/bochsrc
View file

@ -9,7 +9,7 @@ boot: disk
#floppya: type=1_44, 1_44=".floppy-image", status=inserted, write_protected=0
# no floppyb
ata0: enabled=true, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14
ata0-master: type=disk, path="_disk_image", mode=flat, cylinders=0, heads=0, spt=0, model="Generic 1234", biosdetect=auto, translation=auto
ata0-master: type=disk, path="grub_disk_image", mode=flat, cylinders=0, heads=0, spt=0, model="Generic 1234", biosdetect=auto, translation=auto
ata0-slave: type=none
ata1: enabled=true, ioaddr1=0x170, ioaddr2=0x370, irq=15
ata1-master: type=none

2
Meta/run.sh
View file

@ -49,7 +49,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0
if [ "$1" = "b" ]; then
# ./run b: bochs
"$SERENITY_BOCHS_BIN" -q -f .bochsrc
"$SERENITY_BOCHS_BIN" -q -f "$SERENITY_ROOT/Meta/bochsrc"
elif [ "$1" = "qn" ]; then
# ./run qn: qemu without network
"$SERENITY_QEMU_BIN" \