diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-11-05 18:56:13 +0100 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-11-05 18:56:43 +0100 |
| commit | 3de3daf765670365b0466128307accd9b395d307 (patch) | |
| tree | b7a6368b5761ca8952c074210c1d5526bf8e8cc5 /Kernel | |
| parent | 1466a7364c1b0b3ff3c7fdd2af3a45a068d72c6e (diff) | |
| download | serenity-3de3daf765670365b0466128307accd9b395d307.zip | |
run: Unbreak the run script
Diffstat (limited to 'Kernel')
| -rwxr-xr-x | Kernel/run | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Kernel/run b/Kernel/run index c39a06f0b8..dc02ed80dc 100755 --- a/Kernel/run +++ b/Kernel/run @@ -1,5 +1,7 @@ #!/bin/sh +#SERENITY_PACKET_LOGGING_ARG="-object filter-dump,id=hue,netdev=br0,file=e1000.pcap" + [ -e /dev/kvm -a -r /dev/kvm -a -w /dev/kvm ] && SERENITY_KVM_ARG="-enable-kvm" [ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386" @@ -36,7 +38,7 @@ elif [ "$1" = "qtap" ]; then sudo $SERENITY_QEMU_BIN \ $SERENITY_COMMON_QEMU_ARGS \ $SERENITY_KVM_ARG \ -# -object filter-dump,id=hue,netdev=br0,file=e1000.pcap \ + $SERENITY_PACKET_LOGGING_ARG \ -netdev tap,ifname=tap0,id=br0 \ -device e1000,netdev=br0 \ -kernel kernel \ @@ -46,7 +48,7 @@ elif [ "$1" = "qgrub" ]; then $SERENITY_QEMU_BIN \ $SERENITY_COMMON_QEMU_ARGS \ $SERENITY_KVM_ARG \ -# -object filter-dump,id=hue,netdev=breh,file=e1000.pcap \ + $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 [ "$1" = "qtext" ]; then @@ -61,7 +63,7 @@ else $SERENITY_QEMU_BIN \ $SERENITY_COMMON_QEMU_ARGS \ $SERENITY_KVM_ARG \ -# -object filter-dump,id=hue,netdev=breh,file=e1000.pcap \ + $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 \ -kernel kernel \ |