initrd.sh: improve kernel package selection logic

1 files changed, 10 insertions, 11 deletions

diff --git a/src/initrd.sh b/src/initrd.sh
index b6939b1..802e4ac 100755
--- a/src/initrd.sh
+++ b/src/initrd.sh
@@ -4,18 +4,17 @@
 
 initrd=${samizdat_linux_dir}/initrd.img
 vmlinuz=${samizdat_linux_dir}/vmlinuz
-
-# version=4.9.0-6-amd64
-# version=$(apt-cache policy linux-image-amd64 | sed -ne 's/  Candidate: //p' || uname -r)
-kernel_package=linux-image-rt-amd64
-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-}
-
 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" "$@"
 }
@@ -31,8 +30,8 @@ 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-"${version}" "$vmlinuz"
+    /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" "${version}" || force_rebuild
 }
 
 if [ ! -e "$initrd" -o ! -e "$vmlinuz" ]; then