default "make boot" to use slow boot (with pxe to get kernel)

1 files changed, 7 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index e5a3109..bfa02b7 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,9 @@ $(SUBMODULES):
 install-submodules: cmd=install
 install-submodules: $(SUBMODULES)
 
+rootfs = samizdat
+export rootfs
+
 .PHONY: rootfs
 rootfs:
         [ -e install-submodules-stamp ] || make install-submodules-stamp
@@ -102,17 +105,11 @@ rootfs:
         sudo mkdir -p /srv/nbd
         sudo ln -sf "$$PWD"/rootfs/$(rootfs).btrfs /srv/nbd/samizdat.btrfs
 
-rootfs = samizdat
-
-define get_kernel_version
-egrep '^ii  linux-image-(amd64|686)' rootfs/_build/$(rootfs).pkgs.txt  | \
-        (read _ pkg ver _; apt-cache show $$pkg=$$ver) | \
-        grep Depends | \
-        (read _ a; echo $${a#linux-image-})
-endef
-
 boot: rootfs
-        sudo kernel_version=$$($(get_kernel_version)) qemu.sh
+        sudo SLOW_BOOT=y qemu.sh
+
+fastboot: rootfs
+        sudo qemu.sh
 
 reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse_child=$$child; true)