From d211b4e5352b3a94e0f297802a1b3e67cb51ef13 Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Fri, 4 Oct 2019 21:26:34 -0400
Subject: use correct kernel version for booting

specifically, use the version of linux-image-amd64 present in samizdat.btrfs
---
 src/initrd.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/initrd.sh b/src/initrd.sh
index 802e4ac..b99aa4e 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -7,14 +7,6 @@ vmlinuz=${samizdat_linux_dir}/vmlinuz
 conf_dir=$samizdat_initramfs_conf_dir
 apt_dependencies=$samizdat_initrd_files_dir/initrd-dependencies.txt
 
-for kernel_package in linux-image-rt-amd64 linux-image-amd64
-do
-  kernel_package_version=$(apt-cache policy $kernel_package | sed -ne 's/ *Installed: //p')
-  real_kernel_package=$(apt-cache show $kernel_package=$kernel_package_version | sed -n 's/^Depends: //p')
-  version=${real_kernel_package#linux-image-}
-  [ -e "/boot/vmlinuz-${version}" ] && break
-done
-
 find_source_dirs() {
     find "$conf_dir" "$samizdat_initrd_files_dir" "$@"
 }
@@ -30,10 +22,12 @@ rebuild()
     [ ! -f "$apt_dependencies" ] || sudo apt-get install -q=10 --no-upgrade -y $(cat "$apt_dependencies")
 
     set -ex
-    cp -f /boot/vmlinuz-"${version}" "$vmlinuz"
-    /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${version}" || force_rebuild
+    cp -f /boot/vmlinuz-"${kernel_version}" "$vmlinuz"
+    /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${kernel_version}" || force_rebuild
 }
 
+[ "$kernel_version" ]
+
 if [ ! -e "$initrd" -o ! -e "$vmlinuz" ]; then
     rebuild
 elif [ "$(find_source_dirs -newer "$initrd" -print -quit)" ]; then
-- 
cgit v1.2.3