diff options
Diffstat (limited to 'src/qemu.sh')
-rwxr-xr-x | src/qemu.sh | 25 |
1 files changed, 20 insertions, 5 deletions
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' | |||
21 | 21 | ||
22 | initrd=${samizdat_isolinux_dir}/linux/initrd.img | 22 | initrd=${samizdat_isolinux_dir}/linux/initrd.img |
23 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz | 23 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz |
24 | kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' | 24 | kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp netkeys' |
25 | kcmdline_CDROM_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' | ||
25 | kcmdline_CDROM='boot=samizdat components quiet splash' | 26 | kcmdline_CDROM='boot=samizdat components quiet splash' |
26 | 27 | ||
28 | set -- | ||
27 | if [ "$USE_ISO" ]; then | 29 | if [ "$USE_ISO" ]; then |
28 | [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_CDROM" | 30 | set -- "$@" -cdrom "$iso" |
29 | set -- -cdrom "$iso" | 31 | if [ "$QEMU_LOADS_LINUX" ]; then |
32 | set -- "$@" -initrd "$initrd" -kernel "$kernel" | ||
33 | if [ "$NO_NET" ]; then | ||
34 | set -- "$@" -append "$kcmdline_CDROM" | ||
35 | else | ||
36 | set -- "$@" -append "$kcmdline_CDROM_NET" | ||
37 | fi | ||
38 | else | ||
39 | set -- "$@" -boot d | ||
40 | fi | ||
30 | else | 41 | else |
31 | [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET" | 42 | if [ "$QEMU_LOADS_LINUX" ]; then |
32 | set -- -boot n | 43 | set -- "$@" -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET" |
44 | else | ||
45 | set -- "$@" -boot n | ||
46 | fi | ||
33 | fi | 47 | fi |
34 | 48 | ||
49 | set -x | ||
35 | sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \ | 50 | sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \ |
36 | -vga qxl \ | 51 | -vga qxl \ |
37 | -net nic,vlan=0,model=virtio \ | 52 | -net nic,vlan=0,model=virtio \ |