3 files changed, 42 insertions, 15 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index 3415f18..2dffdd1 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -1,25 +1,31 @@
 #!/bin/sh
 [ "$1" = prereqs ] && { echo; exit; }
 
+CopyExec() { copy_exec "$@" || exit 1; }
+
 . /usr/share/initramfs-tools/hook-functions
 
-for f in ./old-school/*; do copy_exec "$f" /bin; done
+for f in ./old-school/*; do CopyExec "$f" /bin; done
 
-path_execs='mountpoint openvt'
+# TODO: check samizdat source to see what it copies
+path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs'
 
-for c in $path_execs; do copy_exec "$(which $c)" /bin; done
+for c in $path_execs; do CopyExec "$(which $c)" /bin; done
 
-copy_exec /bin/openvt /bin/OpenVT
+CopyExec /bin/openvt /bin/OpenVT
 
 absolute_path_copies='/lib/terminfo/l/linux'
 
-for f in $absolute_path_copies; do copy_exec "$f" "$f"; done
+for f in $absolute_path_copies; do CopyExec "$f" "$f"; done
 
 samizdat_execs_dir=/home/d/src/samizdat # TODO
-samizdat_execs='wait_for_files samizdat-pinentry dynmenu'
+samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent'
+
+for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 
-for c in $samizdat_execs; do copy_exec ${samizdat_execs_dir}/$c /bin; done
+CopyExec vol_id.txt /lib/samizdat/vol_id.txt
 
-copy_exec vol_id.txt /lib/samizdat/vol_id.txt
+modules='loop xts dm-crypt'
+for m in $modules; do force_load "$m" || exit 1; done
 
 exit 0
diff --git a/initrd-dependencies.txt b/initrd-dependencies.txt
new file mode 100644
index 0000000..6f4f9e6
--- /dev/null
+++ b/initrd-dependencies.txt
@@ -0,0 +1,5 @@
+expect
+pgpdump
+monkeysphere
+libmime-base32-perl
+pinentry-curses
diff --git a/initrd.sh b/initrd.sh
index 5adb405..1eca9bb 100755
--- a/initrd.sh
+++ b/initrd.sh
@@ -6,14 +6,30 @@ vmlinuz=isolinux/live/vmlinuz
 version=$(uname -r)
 conf_dir=initramfs-tools
 
-if [ ! -e "$initrd" -o ! -e "$vmlinuz" ]; then
-    need_update=1
-elif [ "$(find "$conf_dir" -newer "$initrd" -print -quit)" ]; then
-    need_update=1
-fi
+apt_dependencies=initrd-dependencies.txt
+
+find_source_dirs() {
+    set -- find "$conf_dir" ./old-school "$@"
+    "$@"
+}
+
+force_rebuild()
+{
+    touch "$conf_dir"
+    return 1
+}
+
+rebuild()
+{
+    [ ! -f "$apt_dependencies" ] || sudo apt-get install -q=10 --no-upgrade -y $(cat "$apt_dependencies")
 
-if [ "$need_update" ]; then
     set -ex
     cp -f /boot/vmlinuz-${version} "$vmlinuz"
-    /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" ${version}
+    /usr/sbin/mkinitramfs -d "$conf_dir" -o "$initrd" ${version} || force_rebuild
+}
+
+if [ ! -e "$initrd" -o ! -e "$vmlinuz" ]; then
+    rebuild
+elif [ "$(find_source_dirs -newer "$initrd" -print -quit)" ]; then
+    rebuild
 fi