summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMeta/run.sh9
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"