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

Meta: Add q35grub option in run.sh

Browse source 
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.
This commit is contained in:
Liav A 2021-09-03 13:26:20 +03:00 • committed by Andreas Kling
parent 1da081bf86
commit 8cb4fcdbd8
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Meta/run.sh
View file

@ -74,7 +74,7 @@ fi
[ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=512M [ -z "$SERENITY_RAM_SIZE" ] && SERENITY_RAM_SIZE=512M
[ -z "$SERENITY_DISK_IMAGE" ] && { [ -z "$SERENITY_DISK_IMAGE" ] && {
if [ "$SERENITY_RUN" = qgrub ]; then if [ "$SERENITY_RUN" = q35grub ] || [ "$SERENITY_RUN" = qgrub ]; then
SERENITY_DISK_IMAGE="grub_disk_image" SERENITY_DISK_IMAGE="grub_disk_image"
elif [ "$SERENITY_RUN" = qextlinux ]; then elif [ "$SERENITY_RUN" = qextlinux ]; then
SERENITY_DISK_IMAGE="extlinux_disk_image" SERENITY_DISK_IMAGE="extlinux_disk_image"
@ -328,6 +328,13 @@ elif [ "$SERENITY_RUN" = "q35" ]; then
-kernel Kernel/Prekernel/Prekernel \ -kernel Kernel/Prekernel/Prekernel \
-initrd Kernel/Kernel \ -initrd Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}" -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 elif [ "$SERENITY_RUN" = "ci" ]; then
# Meta/run.sh ci: qemu in text mode # Meta/run.sh ci: qemu in text mode
echo "Running QEMU in CI" echo "Running QEMU in CI"