diff options
| author | Emanuele Torre <torreemanuele6@gmail.com> | 2020-06-24 04:00:02 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-07-01 12:53:39 +0200 |
| commit | aabb482d5c65fb3986015bfc9b20286d9d79aae3 (patch) | |
| tree | f2e64dd18715012d636770c8f68c13702ab74f93 | |
| parent | 86685623a2b6d22de92f9e18ae874bfc8a7cd6af (diff) | |
| download | serenity-aabb482d5c65fb3986015bfc9b20286d9d79aae3.zip | |
Meta: move Kernel/.bochsrc => Meta/bochsrc
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`
| -rw-r--r-- | Meta/bochsrc (renamed from Kernel/.bochsrc) | 2 | ||||
| -rwxr-xr-x | Meta/run.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Kernel/.bochsrc b/Meta/bochsrc index cc4df97a05..fb08a02668 100644 --- a/Kernel/.bochsrc +++ b/Meta/bochsrc @@ -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 diff --git a/Meta/run.sh b/Meta/run.sh index c84efaaa39..d7ed43d6c0 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -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" \ |