From 1bddec3db035c4878a91fba7ce585b4ac727a89f Mon Sep 17 00:00:00 2001
From: Andrew Cady <d@jerkface.net>
Date: Wed, 20 Apr 2016 14:52:02 -0400
Subject: add various missing dependencies

---
 initramfs-tools/hooks/samizdat | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'initramfs-tools/hooks/samizdat')

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
-- 
cgit v1.2.3