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

run: Unbreak the run script

Browse source
This commit is contained in:
Andreas Kling 2019-11-05 18:56:13 +01:00
parent 1466a7364c
commit 3de3daf765
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Kernel/run
View file

@ -1,5 +1,7 @@
#!/bin/sh #!/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" [ -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" [ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386"
@ -36,7 +38,7 @@ elif [ "$1" = "qtap" ]; then
sudo $SERENITY_QEMU_BIN \ sudo $SERENITY_QEMU_BIN \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
$SERENITY_KVM_ARG \ $SERENITY_KVM_ARG \
# -object filter-dump,id=hue,netdev=br0,file=e1000.pcap \ $SERENITY_PACKET_LOGGING_ARG \
-netdev tap,ifname=tap0,id=br0 \ -netdev tap,ifname=tap0,id=br0 \
-device e1000,netdev=br0 \ -device e1000,netdev=br0 \
-kernel kernel \ -kernel kernel \
@ -46,7 +48,7 @@ elif [ "$1" = "qgrub" ]; then
$SERENITY_QEMU_BIN \ $SERENITY_QEMU_BIN \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
$SERENITY_KVM_ARG \ $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 \ -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 -device e1000,netdev=breh
elif [ "$1" = "qtext" ]; then elif [ "$1" = "qtext" ]; then
@ -61,7 +63,7 @@ else
$SERENITY_QEMU_BIN \ $SERENITY_QEMU_BIN \
$SERENITY_COMMON_QEMU_ARGS \ $SERENITY_COMMON_QEMU_ARGS \
$SERENITY_KVM_ARG \ $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 \ -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 \ -device e1000,netdev=breh \
-kernel kernel \ -kernel kernel \