From 131f14ed625b69b73432ad264f234cf69f012b6c Mon Sep 17 00:00:00 2001 From: Conrad Pankoff Date: Tue, 24 Dec 2019 08:07:29 +1100 Subject: [PATCH] Meta: Add environment variable to specify bochs command in run script --- Kernel/run | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Kernel/run b/Kernel/run index c39448636d..b666ea3543 100755 --- a/Kernel/run +++ b/Kernel/run @@ -4,6 +4,8 @@ [ -e /dev/kvm -a -r /dev/kvm -a -w /dev/kvm ] && SERENITY_KVM_ARG="-enable-kvm" +[ -z "$SERENITY_BOCHS_BIN" ] && SERENITY_BOCHS_BIN="bochs" + [ -z "$SERENITY_QEMU_BIN" ] && SERENITY_QEMU_BIN="qemu-system-i386" [ -z "$SERENITY_KERNEL_CMDLINE" ] && SERENITY_KERNEL_CMDLINE="hello" @@ -25,7 +27,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0 if [ "$1" = "b" ]; then # ./run b: bochs - bochs -q -f .bochsrc + $SERENITY_BOCHS_BIN -q -f .bochsrc elif [ "$1" = "qn" ]; then # ./run qn: qemu without network $SERENITY_QEMU_BIN \