build-vm, tar2fs: unify kver handling

No need to deduce kernel version again, just save it in a temporary file. The main reason to change what worked is that e2k kernel-image package has Linux bits named as image-$kver and not vmlinuz-$kver; the guessing logic taking all of this into account resulted in non-aesthetic patch. NB: there's a duplicating script within kernel feature; it wasn't easy to avoid this and it might differ when handling multiple kernels, I didn't think much about this now as vm images tend to ship with the sole one.

build-vm, tar2fs: unify kver handling
3d7a0c5c · Michael Shigorin · f58f10d1 · 3d7a0c5c · 3d7a0c5c
Commit 3d7a0c5c authored Aug 02, 2017 by Michael Shigorin
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 4 deletions

tar2fs bin/tar2fs +8 -2

07-kernel features.in/build-vm/image-scripts.d/07-kernel +9 -2

No files found.
--- a/bin/tar2fs
+++ b/bin/tar2fs
@@ -205,8 +205,14 @@ fi
 echo "MODULES_PRELOAD += $INITRD_MODULES $ROOTFSTYPE" >> "$ROOTFS/etc/initrd.mk"
 echo "FEATURES += qemu" >> "$ROOTFS/etc/initrd.mk"
-KERNEL="$(readlink $ROOTFS/boot/vmlinuz | sed 's,vmlinuz-,,')"
+# NB: don't stick BOOTFS here, it has slightly different semantics
-chroot "$ROOTFS" make-initrd -k "$KERNEL"
+pushd $ROOTFS/boot
+if [ -s .origver ]; then
+	read KVER < .origver
+fi
+[ -n "$KVER" ] || fatal "unable to deduce kernel version"
+chroot "$ROOTFS" make-initrd -k "$KVER"
+rm -f .origver
 # ...target device too
 sed -i "s,$LOOPROOT,$ROOTDEV," "$ROOTFS/etc/fstab"

--- a/features.in/build-vm/image-scripts.d/07-kernel
+++ b/features.in/build-vm/image-scripts.d/07-kernel
@@ -9,5 +9,12 @@ kver="$(rpm -qa 'kernel-image*' \
        | cut -f 2 -d ' ' \
        | sed 's/kernel-image-//')"
-ln -s vmlinuz-$kver /boot/vmlinuz
+[ -n "$kver" ] || { echo "** unable to deduce kernel version" >&2; exit 1; }
-ln -s initrd-$kver.img /boot/initrd.img
+cd /boot
+echo "$kver" > .origver	# for tar2fs
+# NB: e2k kernel builds "image" instead of "vmlinuz"
+[ -f vmlinuz-$kver ] && ln -s vmlinuz-$kver vmlinuz ||:
+ln -s initrd-$kver.img initrd.img	# missing at this stage
+: