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

Meta: Remove options of explicit command line runners in run script

Browse source 
Let's remove the qcmd and q35_cmd options and instead have a simple
"q35" run option. Specifiying the kernel command line was a neat trick
I personally used for many debug sessions, but it seems better to stick
to setting it internally in the kernel or modifying the shell
SERENITY_KERNEL_CMDLINE environment variable to do this.
This commit is contained in:
Liav A 2021-07-09 23:11:50 +03:00 • committed by Andreas Kling
parent c92c944356
commit 11fe38346c
1 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Meta/run.sh
View file

@ -211,11 +211,9 @@ elif [ "$SERENITY_RUN" = "qgrub" ]; then
$SERENITY_PACKET_LOGGING_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 e1000,netdev=breh
elif [ "$SERENITY_RUN" = "q35_cmd" ]; then
# Meta/run.sh q35_cmd: qemu (q35 chipset) with SerenityOS with custom commandline
shift
SERENITY_KERNEL_CMDLINE="$*"
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
elif [ "$SERENITY_RUN" = "q35" ]; then
# Meta/run.sh q35: qemu (q35 chipset) with SerenityOS
echo "Starting SerenityOS with QEMU Q35 machine, Commandline: ${SERENITY_KERNEL_CMDLINE}"
"$SERENITY_QEMU_BIN" \
$SERENITY_COMMON_QEMU_Q35_ARGS \
$SERENITY_VIRT_TECH_ARG \
@ -223,18 +221,6 @@ elif [ "$SERENITY_RUN" = "q35_cmd" ]; then
-device e1000,netdev=breh \
-kernel Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}"
elif [ "$SERENITY_RUN" = "qcmd" ]; then
# Meta/run.sh qcmd: qemu with SerenityOS with custom commandline
shift
SERENITY_KERNEL_CMDLINE="$*"
echo "Starting SerenityOS, Commandline: ${SERENITY_KERNEL_CMDLINE}"
"$SERENITY_QEMU_BIN" \
$SERENITY_COMMON_QEMU_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 e1000,netdev=breh \
-kernel Kernel/Kernel \
-append "${SERENITY_KERNEL_CMDLINE}"
elif [ "$SERENITY_RUN" = "ci" ]; then
# Meta/run.sh ci: qemu in text mode
echo "Running QEMU in CI"