diff options
-rwxr-xr-x | src/qemu.sh | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/qemu.sh b/src/qemu.sh index 207ca68..f9982c4 100755 --- a/src/qemu.sh +++ b/src/qemu.sh | |||
@@ -2,11 +2,8 @@ | |||
2 | 2 | ||
3 | . samizdat-paths.sh | 3 | . samizdat-paths.sh |
4 | 4 | ||
5 | # iso=debian-live-8.4.0-amd64-gnome-desktop.iso | ||
6 | # iso=debian-live-8.4.0-amd64-standard.iso | ||
7 | # iso=debian-live-8.4.0-amd64-standard.btrfs.iso | ||
8 | iso=${samizdat_iso_dir}/samizdat.iso | 5 | iso=${samizdat_iso_dir}/samizdat.iso |
9 | disk=${samizdat_iso_dir}/debian-live-8.4.0-amd64-standard.btrfs.disk | 6 | disk=${samizdat_iso_dir}/samizdat.disk.img |
10 | layered=${samizdat_iso_dir}/${iso%.iso}.layered.iso | 7 | layered=${samizdat_iso_dir}/${iso%.iso}.layered.iso |
11 | 8 | ||
12 | [ -f "$layered" ] && iso=$layered | 9 | [ -f "$layered" ] && iso=$layered |
@@ -17,21 +14,22 @@ initrd.sh || { echo "initrd.sh failed" >&2; exit 1; }; | |||
17 | 14 | ||
18 | NET='tap,vlan=0,ifname=tap0,script=no,downscript=no' | 15 | NET='tap,vlan=0,ifname=tap0,script=no,downscript=no' |
19 | 16 | ||
20 | # To test local pxe boot server: | 17 | [ "$SLOW_BOOT" ] || QEMU_LOADS_LINUX=y |
18 | |||
19 | # To use qemu built-in pxe boot server: | ||
21 | # NET='user,tftp=isolinux,bootfile=/pxelinux.0' | 20 | # NET='user,tftp=isolinux,bootfile=/pxelinux.0' |
22 | 21 | ||
23 | initrd=${samizdat_isolinux_dir}/linux/initrd.img | 22 | initrd=${samizdat_isolinux_dir}/linux/initrd.img |
24 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz | 23 | kernel=${samizdat_isolinux_dir}/linux/vmlinuz |
25 | kcmdline='boot=samizdat components quiet splash' | 24 | kcmdline_NET='boot=samizdat components quiet splash nbdroot=192.168.10.1,samizdat.btrfs nbddev=/dev/nbd0 ip=dhcp' |
26 | 25 | kcmdline_CDROM='boot=samizdat components quiet splash' | |
27 | if [ "$QEMU_LOADS_LINUX" ]; then | ||
28 | set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline" | ||
29 | fi | ||
30 | 26 | ||
31 | if [ "$USE_ISO" ]; then | 27 | if [ "$USE_ISO" ]; then |
32 | set -- -cdrom "$iso" | 28 | [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_CDROM" |
29 | set -- -cdrom "$iso" | ||
33 | else | 30 | else |
34 | set -- -boot n | 31 | [ "$QEMU_LOADS_LINUX" ] && set -- -initrd "$initrd" -kernel "$kernel" -append "$kcmdline_NET" |
32 | set -- -boot n | ||
35 | fi | 33 | fi |
36 | 34 | ||
37 | sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \ | 35 | sudo qemu-system-x86_64 -enable-kvm -smp 2 -m 640 -k en-us \ |