From f137881147088717cbaa343aae3e03c20cc018a0 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 4 May 2019 02:51:50 +0200 Subject: [PATCH] run: Make it easy to override which qemu executable is used. Patch contributed by "pd" --- Kernel/run | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Kernel/run b/Kernel/run index 4d99e94c9b..93a9cd7554 100755 --- a/Kernel/run +++ b/Kernel/run @@ -1,5 +1,7 @@ #!/bin/sh +[ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386" + export SDL_VIDEO_X11_DGAMOUSE=0 ram_size=128 @@ -8,14 +10,14 @@ if [ "$1" = "b" ]; then bochs -q -f .bochsrc elif [ "$1" = "qn" ]; then # ./run qn: qemu without network - qemu-system-i386 -s -m $ram_size \ + $SERENITY_QEMU_BIN -s -m $ram_size \ $SERENITY_EXTRA_QEMU_ARGS \ -device e1000 \ -kernel kernel \ -hda _fs_contents elif [ "$1" = "qtap" ]; then # ./run qtap: qemu with tap - sudo qemu-system-i386 -s -m $ram_size \ + sudo $SERENITY_QEMU_BIN -s -m $ram_size \ $SERENITY_EXTRA_QEMU_ARGS \ -object filter-dump,id=hue,netdev=br0,file=e1000.pcap \ -netdev tap,ifname=tap0,id=br0 \ @@ -24,7 +26,7 @@ elif [ "$1" = "qtap" ]; then -hda _fs_contents else # ./run: qemu with user networking - qemu-system-i386 -s -m $ram_size \ + $SERENITY_QEMU_BIN -s -m $ram_size \ $SERENITY_EXTRA_QEMU_ARGS \ -object filter-dump,id=hue,netdev=breh,file=e1000.pcap \ -netdev user,id=breh,hostfwd=tcp:127.0.0.1:8888-192.168.5.2:8888 \