summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rwxr-xr-xsrc/qemu.sh2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index bc53e47..cf700ee 100644
--- a/Makefile
+++ b/Makefile
@@ -273,6 +273,7 @@ patched.iso: gold.iso rootfs/samizdat.patch.btrfs
273gold.iso: rootfs/seed.iso reused-child 273gold.iso: rootfs/seed.iso reused-child
274 sudo grub-efi.sh 274 sudo grub-efi.sh
275 ! grep 'vmlinuz.*nbdroot' -r ${samizdat_grub_efi_dir} 275 ! grep 'vmlinuz.*nbdroot' -r ${samizdat_grub_efi_dir}
276 initrd.sh
276 rm -f $@~tmp 277 rm -f $@~tmp
277 cp --reflink $< $@~tmp 278 cp --reflink $< $@~tmp
278 sudo xorrisofs -iso-level 3 -- \ 279 sudo xorrisofs -iso-level 3 -- \
diff --git a/src/qemu.sh b/src/qemu.sh
index 813c054..812609a 100755
--- a/src/qemu.sh
+++ b/src/qemu.sh
@@ -10,8 +10,6 @@ layered=${samizdat_iso_dir}/${iso%.iso}.layered.iso
10 10
11[ "$1" ] && iso=$1 11[ "$1" ] && iso=$1
12 12
13initrd.sh || { echo "initrd.sh failed" >&2; exit 1; };
14
15[ "$NO_NET" ] || USE_NET=y 13[ "$NO_NET" ] || USE_NET=y
16 14
17NET='tap,ifname=tap0,script=no,downscript=no' 15NET='tap,ifname=tap0,script=no,downscript=no'