2 files changed, 34 insertions, 10 deletions

diff --git a/src/grub-efi.sh b/src/grub-efi.sh
index f96149d..44b9dec 100755
--- a/src/grub-efi.sh
+++ b/src/grub-efi.sh
@@ -1,11 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 . samizdat-paths.sh
 
+linux_kernel_commandline='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
+
 grub_config()
 {
     cat <<EOF
 insmod echo
 echo GRUB
+
+insmod normal
+insmod keystatus
+
+insmod linux
+insmod iso9660
+
 insmod part_acorn
 insmod part_amiga
 insmod part_apple
@@ -17,13 +26,13 @@ insmod part_plan
 insmod part_sun
 insmod part_sunpc
 
-insmod linux
-insmod iso9660
-
 echo Loading vmlinuz...
-linux /linux/vmlinuz boot=samizdat components quiet splash
+
+linux /linux/vmlinuz ${linux_kernel_commandline}
+
 echo Loading initrd.img...
 initrd /linux/initrd.img
+
 echo Booting.
 echo
 boot
diff --git a/src/qemu.sh b/src/qemu.sh
index f9982c4..b095eb8 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -21,17 +21,32 @@ NET='tap,vlan=0,ifname=tap0,script=no,downscript=no'
 
 initrd=${samizdat_isolinux_dir}/linux/initrd.img
 kernel=${samizdat_isolinux_dir}/linux/vmlinuz
-kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
+      kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp netkeys'
+kcmdline_CDROM_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp'
 kcmdline_CDROM='boot=samizdat components quiet splash'
 
+set --
 if [ "$USE_ISO" ]; then
-    [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_CDROM"
-    set -- -cdrom "$iso"
+    set -- "$@" -cdrom "$iso"
+    if [ "$QEMU_LOADS_LINUX" ]; then
+        set -- "$@" -initrd "$initrd" -kernel "$kernel"
+        if [ "$NO_NET" ]; then
+            set -- "$@" -append "$kcmdline_CDROM"
+        else
+            set -- "$@" -append "$kcmdline_CDROM_NET"
+        fi
+    else
+        set -- "$@" -boot d
+    fi
 else
-    [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET"
-    set -- -boot n
+    if [ "$QEMU_LOADS_LINUX" ]; then
+        set -- "$@" -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET"
+    else
+        set -- "$@" -boot n
+    fi
 fi
 
+set -x
 sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \
      -vga qxl \
      -net nic,vlan=0,model=virtio \