mkinitramfs-samizdat: use standard location for initrd by default

2 files changed, 13 insertions, 11 deletions

diff --git a/Makefile b/Makefile
index 061209c..ce5b47d 100644
--- a/Makefile
+++ b/Makefile
@@ -358,10 +358,10 @@ upgrade:
 
 testinitrdkey:
         make install
-        ./src/mkinitramfs-samizdat -s
+        ./src/mkinitramfs-samizdat
         make -C partitions clean keymu
 
 testinitrd:
         make install
-        ./src/mkinitramfs-samizdat -s
+        ./src/mkinitramfs-samizdat
         make -C partitions clean emu
diff --git a/src/mkinitramfs-samizdat b/src/mkinitramfs-samizdat
index 52e86b5..c2e6141 100755
--- a/src/mkinitramfs-samizdat
+++ b/src/mkinitramfs-samizdat
@@ -18,22 +18,21 @@ deb_arch()
 
 up_to_date()
 {
-    local found system_initrd
-    system_initrd=${1%$OUTPUT_TAG}
+    local found
     [ -e "$1" ] || return
+    [ -z "$FORCE_BUILD" ] || return
     found=$(find "$samizdat_initramfs_conf_dir" \
                  "$samizdat_initrd_files_dir" \
-                 "$system_initrd" \
                  -type f -newer "$1" -print -quit) || return
     [ -z "$found" ]
 }
 
 build_image()
 {
-    OUTPUT=/boot/initrd.img-$1${OUTPUT_TAG}
+    OUTPUT=/boot/initrd.img-$1
     # Always regenerate when --system specified.
     # Otherwise, only regenerate if it appears dependencies changed.
-    if [ -z "$OUTPUT_TAG" ] || ! up_to_date "$OUTPUT"
+    if ! up_to_date "$OUTPUT"
     then
         /usr/sbin/mkinitramfs \
             -d "$samizdat_initramfs_conf_dir" \
@@ -45,15 +44,18 @@ build_image()
 
 . samizdat-paths.sh
 
-OUTPUT_TAG=.samizdat
+OUTPUT_TAG=
+FORCE_BUILD=
 while [ $# -gt 0 ]
 do
     case "$1" in
-        -s|--system) OUTPUT_TAG=; shift; continue;;
+        -t|--tag) OUTPUT_TAG=.samizdat;;
+        -f|--force) FORCE_BUILD=y;;
         --) shift; break;;
-        -?) exit 1;;
+        -*) exit 1;;
         *) break;;
     esac
+    shift
 done
 
 if [ "$1" ]
@@ -64,7 +66,7 @@ then
         printf 'Error: No such file: %s\n' "$k" >&2
         exit 1
     fi
-    build_image "$1" || exit
+    build_image "$1$OUTPUT_TAG" || exit
     ln -sf "${k#/}" /vmlinuz
 elif [ -L /vmlinuz ]
 then