RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 11:57:35 +00:00
Code Issues Activity Actions

Meta: make Meta/run.sh qgrub work.

Browse source
This commit is contained in:
Emanuele Torre 2020-06-24 11:01:31 +02:00 • committed by Andreas Kling
parent 8f071137d1
commit 6f8042d8e5
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Meta/run.sh
View file

@ -20,6 +20,14 @@ die() {
[ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=256M [ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=256M
[ -z "$SERENITY_DISK_IMAGE" ] && {
if [ "$1" = qgrub ]; then
SERENITY_DISK_IMAGE="grub_disk_image"
else
SERENITY_DISK_IMAGE="_disk_image"
fi
}
[ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS=" [ -z "$SERENITY_COMMON_QEMU_ARGS" ] && SERENITY_COMMON_QEMU_ARGS="
$SERENITY_EXTRA_QEMU_ARGS $SERENITY_EXTRA_QEMU_ARGS
-s -m $SERENITY_RAM_SIZE -s -m $SERENITY_RAM_SIZE
@ -27,7 +35,7 @@ $SERENITY_EXTRA_QEMU_ARGS
-d cpu_reset,guest_errors -d cpu_reset,guest_errors
-smp 2 -smp 2
-device VGA,vgamem_mb=64 -device VGA,vgamem_mb=64
-drive file=_disk_image,format=raw,index=0,media=disk -drive file=${SERENITY_DISK_IMAGE},format=raw,index=0,media=disk
-device ich9-ahci -device ich9-ahci
-debugcon stdio -debugcon stdio
-soundhw pcspk -soundhw pcspk
@ -43,7 +51,7 @@ $SERENITY_EXTRA_QEMU_ARGS
-smp 2 -smp 2
-device VGA,vgamem_mb=64 -device VGA,vgamem_mb=64
-device piix3-ide -device piix3-ide
-drive file=_disk_image,id=disk,if=none -drive file=${SERENITY_DISK_IMAGE},id=disk,if=none
-device ide-hd,bus=ide.6,drive=disk,unit=0 -device ide-hd,bus=ide.6,drive=disk,unit=0
-debugcon stdio -debugcon stdio
-soundhw pcspk -soundhw pcspk