diff options
author | Andrew Cady <d@jerkface.net> | 2019-10-15 12:08:01 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-10-15 12:08:01 -0400 |
commit | c73bf534d8558c1a4ad70159aebc2cba0c2e2c77 (patch) | |
tree | 127ac8140c16a575b1efc6286b58375ec7cccd3e | |
parent | 4ec27faa89ec4ce56e198da8799cf146e0137850 (diff) |
default "make boot" to use slow boot (with pxe to get kernel)
-rw-r--r-- | Makefile | 17 | ||||
-rwxr-xr-x | src/initrd.sh | 11 | ||||
-rw-r--r-- | src/samizdat-paths.in | 1 |
3 files changed, 18 insertions, 11 deletions
@@ -94,6 +94,9 @@ $(SUBMODULES): | |||
94 | install-submodules: cmd=install | 94 | install-submodules: cmd=install |
95 | install-submodules: $(SUBMODULES) | 95 | install-submodules: $(SUBMODULES) |
96 | 96 | ||
97 | rootfs = samizdat | ||
98 | export rootfs | ||
99 | |||
97 | .PHONY: rootfs | 100 | .PHONY: rootfs |
98 | rootfs: | 101 | rootfs: |
99 | [ -e install-submodules-stamp ] || make install-submodules-stamp | 102 | [ -e install-submodules-stamp ] || make install-submodules-stamp |
@@ -102,17 +105,11 @@ rootfs: | |||
102 | sudo mkdir -p /srv/nbd | 105 | sudo mkdir -p /srv/nbd |
103 | sudo ln -sf "$$PWD"/rootfs/$(rootfs).btrfs /srv/nbd/samizdat.btrfs | 106 | sudo ln -sf "$$PWD"/rootfs/$(rootfs).btrfs /srv/nbd/samizdat.btrfs |
104 | 107 | ||
105 | rootfs = samizdat | ||
106 | |||
107 | define get_kernel_version | ||
108 | egrep '^ii linux-image-(amd64|686)' rootfs/_build/$(rootfs).pkgs.txt | \ | ||
109 | (read _ pkg ver _; apt-cache show $$pkg=$$ver) | \ | ||
110 | grep Depends | \ | ||
111 | (read _ a; echo $${a#linux-image-}) | ||
112 | endef | ||
113 | |||
114 | boot: rootfs | 108 | boot: rootfs |
115 | sudo kernel_version=$$($(get_kernel_version)) qemu.sh | 109 | sudo SLOW_BOOT=y qemu.sh |
110 | |||
111 | fastboot: rootfs | ||
112 | sudo qemu.sh | ||
116 | 113 | ||
117 | reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse_child=$$child; true) | 114 | reuse_child := $(shell 2>/dev/null read child < reused-child && echo --reuse_child=$$child; true) |
118 | 115 | ||
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 | |||
7 | conf_dir=$samizdat_initramfs_conf_dir | 7 | conf_dir=$samizdat_initramfs_conf_dir |
8 | apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt | 8 | apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt |
9 | 9 | ||
10 | get_kernel_version() | ||
11 | { | ||
12 | local pkgs_file="$1" | ||
13 | egrep '^ii linux-image-(amd64|686)' "$pkgs_file" | | ||
14 | (read _ pkg ver _; apt-cache show "$pkg=$ver") | | ||
15 | grep Depends | | ||
16 | (read _ a; echo ${a#linux-image-}) | ||
17 | } | ||
18 | |||
19 | kernel_version=$(get_kernel_version rootfs/_build/${rootfs:-samizdat}.pkgs.txt) | ||
20 | |||
10 | debian_initrd=/boot/initrd.img-${kernel_version} | 21 | debian_initrd=/boot/initrd.img-${kernel_version} |
11 | 22 | ||
12 | find_deps() { | 23 | 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 | |||
11 | samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools | 11 | samizdat_initramfs_conf_dir=${samizdat_libdir}/initramfs-tools |
12 | 12 | ||
13 | samizdat_iso_dir=. | 13 | samizdat_iso_dir=. |
14 | samizdat_execs_dir=/home/d/src/samizdat | ||