mkinitramfs: fixes, also allow version specified without arch

1 files changed, 24 insertions, 10 deletions

diff --git a/src/mkinitramfs-samizdat b/src/mkinitramfs-samizdat
index 4b46ce4..263504a 100755
--- a/src/mkinitramfs-samizdat
+++ b/src/mkinitramfs-samizdat
@@ -11,6 +11,11 @@ loudly()
     "$@")
 }
 
+deb_arch()
+{
+    dpkg-architecture  -q DEB_HOST_ARCH
+}
+
 up_to_date()
 {
     local found system_initrd
@@ -23,14 +28,18 @@ up_to_date()
     [ -z "$found" ]
 }
 
-f()
+build_image()
 {
     OUTPUT=/boot/initrd.img-$1${OUTPUT_TAG}
-    ([ -z "$OUTPUT_TAG" ] || ! up_to_date "$OUTPUT") &&
-    /usr/sbin/mkinitramfs \
-         -d "$samizdat_initramfs_conf_dir" \
-         -o "$OUTPUT" \
-         -k "$1" || return
+    # Always regenerate when --system specified.
+    # Otherwise, only regenerate if it appears dependencies changed.
+    if [ -z "$OUTPUT_TAG" ] || ! up_to_date "$OUTPUT"
+    then
+        /usr/sbin/mkinitramfs \
+            -d "$samizdat_initramfs_conf_dir" \
+            -o "$OUTPUT" \
+            -k "$1" || return
+    fi
     loudly ln -sf "${OUTPUT#/}" /initrd.img
 }
 
@@ -54,14 +63,19 @@ then
     then
         printf 'Error: No such file: %s\n' "$k" >&2
     fi
-    f "$1" || exit
+    build_image "$1" || exit
     ln -sf "vmlinuz-$1" /vmlinuz
 elif [ -L /vmlinuz ]
 then
     l=$(readlink /vmlinuz)
-    v=${l#boot/vmlinuz-}
-    [ -e "/boot/vmlinuz-$v" ] || exit
-    f "$v"
+    mv=${l#boot/vmlinuz-}
+    for v in "$mv" "$mv-$(deb_arch)"
+    do
+        [ -e "/boot/vmlinuz-$v" ] || continue
+        build_image "$v"
+        exit
+    done
+    exit 1
 else
     printf 'Error: Could not determine kernel version.  Create /vmlinuz or specify a version.' >&2
     exit 1