diff options
| author | Nico Weber <thakis@chromium.org> | 2021-08-28 13:18:48 -0400 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2021-08-28 21:51:30 +0100 |
| commit | ce98aa567c5a2b67ca62ae2ba1fd450bb479943e (patch) | |
| tree | b3d88f79f0707aba9a8b291a11c73a60bcb30afd /Meta/run.sh | |
| parent | ad480505af9c9d3e43ef04b934552c61e77ea55e (diff) | |
| download | serenity-ce98aa567c5a2b67ca62ae2ba1fd450bb479943e.zip | |
Meta: Don't pass net -device flags in aarch64 buils in run.sh
Diffstat (limited to 'Meta/run.sh')
| -rwxr-xr-x | Meta/run.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Meta/run.sh b/Meta/run.sh index 60ac6bc8d2..c72fd4fa0d 100755 --- a/Meta/run.sh +++ b/Meta/run.sh @@ -349,12 +349,19 @@ elif [ "$SERENITY_RUN" = "ci" ]; then -append "${SERENITY_KERNEL_CMDLINE}" else # Meta/run.sh: qemu with user networking + if [ "$SERENITY_ARCH" = "aarch64" ]; then + SERENITY_NETFLAGS= + else + SERENITY_NETFLAGS=" + -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,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000,hostfwd=tcp:127.0.0.1:2222-10.0.2.15:22 \ + -device $SERENITY_ETHERNET_DEVICE_TYPE,netdev=breh \ + " + fi "$SERENITY_QEMU_BIN" \ $SERENITY_COMMON_QEMU_ARGS \ $SERENITY_VIRT_TECH_ARG \ $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,hostfwd=tcp:127.0.0.1:8000-10.0.2.15:8000,hostfwd=tcp:127.0.0.1:2222-10.0.2.15:22 \ - -device $SERENITY_ETHERNET_DEVICE_TYPE,netdev=breh \ + $SERENITY_NETFLAGS \ -kernel Kernel/Prekernel/Prekernel \ -initrd Kernel/Kernel \ -append "${SERENITY_KERNEL_CMDLINE}" |