From f200e83db0dea1d120cf91d6c71c2d74b00b9706 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Tue, 3 May 2016 14:36:19 +0200
Subject: fix everything

---
 src/qemu.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'src/qemu.sh')

diff --git a/src/qemu.sh b/src/qemu.sh
index 3b355b4..207ca68 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -24,11 +24,20 @@ initrd=${samizdat_isolinux_dir}/linux/initrd.img
 kernel=${samizdat_isolinux_dir}/linux/vmlinuz
 kcmdline='boot=samizdat components quiet splash'
 
+if [ "$QEMU_LOADS_LINUX" ]; then
+  set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline"
+fi
+
+if [ "$USE_ISO" ]; then
+  set -- -cdrom "$iso"
+else
+  set -- -boot n
+fi
+
 sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
      -vga qxl \
      -net nic,vlan=0,model=virtio \
      -net "$NET" \
      -rtc base=localtime \
-     -cdrom "$iso" \
      -hda "$disk" \
-     -initrd "$initrd" -kernel "$kernel" -append "$kcmdline"
+     "$@"
-- 
cgit v1.2.3