diff options
| author | Liav A <liavalb@gmail.com> | 2021-09-03 13:26:20 +0300 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-09-04 12:54:00 +0200 |
| commit | 8cb4fcdbd832554fe5838bac4cf4f3902e1afb7e (patch) | |
| tree | 9db0d1d8a746a083e901d804e4fdb0c95dca966c /Meta | |
| parent | 1da081bf86b50cc74d30fd58c215d9ba0e4ef4c9 (diff) | |
| download | serenity-8cb4fcdbd832554fe5838bac4cf4f3902e1afb7e.zip | |
Meta: Add q35grub option in run.sh
This option is similar to the qgrub option, but instead of starting a
QEMU PIIX4 machine, it starts a QEMU Q35 machine, booting a grub image
disk within it.
Diffstat (limited to 'Meta')
| -rwxr-xr-x | Meta/run.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index c72fd4fa0d..7842c45e20 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -74,7 +74,7 @@ fi [ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=512M [ -z "$SERENITY_DISK_IMAGE" ] && { - if [ "$SERENITY_RUN" = qgrub ]; then + if [ "$SERENITY_RUN" = q35grub ] || [ "$SERENITY_RUN" = qgrub ]; then SERENITY_DISK_IMAGE="grub_disk_image" elif [ "$SERENITY_RUN" = qextlinux ]; then SERENITY_DISK_IMAGE="extlinux_disk_image" @@ -328,6 +328,13 @@ elif [ "$SERENITY_RUN" = "q35" ]; then -kernel Kernel/Prekernel/Prekernel \ -initrd Kernel/Kernel \ -append "${SERENITY_KERNEL_CMDLINE}" +elif [ "$SERENITY_RUN" = "q35grub" ]; then + # Meta/run.sh q35grub: qemu (q35 chipset) with SerenityOS, using a grub disk image + "$SERENITY_QEMU_BIN" \ + $SERENITY_COMMON_QEMU_Q35_ARGS \ + $SERENITY_VIRT_TECH_ARG \ + -netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-10.0.2.15:8888,hostfwd=tcp:127.0.0.1:8823-10.0.2.15:23 \ + -device $SERENITY_ETHERNET_DEVICE_TYPE,netdev=breh elif [ "$SERENITY_RUN" = "ci" ]; then # Meta/run.sh ci: qemu in text mode echo "Running QEMU in CI" |