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

3 files changed, 18 insertions, 11 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)
 
diff --git a/src/initrd.sh b/src/initrd.sh
index 164692f..3c692f8 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -7,6 +7,17 @@ vmlinuz=${samizdat_linux_dir}/vmlinuz
 conf_dir=$samizdat_initramfs_conf_dir
 apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt
 
+get_kernel_version()
+{
+    local pkgs_file="$1"
+    egrep '^ii  linux-image-(amd64|686)' "$pkgs_file" |
+        (read _ pkg ver _; apt-cache show "$pkg=$ver") |
+        grep Depends |
+        (read _ a; echo ${a#linux-image-})
+}
+
+kernel_version=$(get_kernel_version rootfs/_build/${rootfs:-samizdat}.pkgs.txt)
+
 debian_initrd=/boot/initrd.img-${kernel_version}
 
 find_deps() {
diff --git a/src/samizdat-paths.in b/src/samizdat-paths.in
index 8f1610c..c1773fe 100644
--- a/src/samizdat-paths.in
+++ b/src/samizdat-paths.in
@@ -11,4 +11,3 @@ samizdat_bindir=PREFIX/bin
 samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools
 
 samizdat_iso_dir=.
-samizdat_execs_dir=/home/d/src/samizdat