fix paths (in progress)

1 files changed, 3 insertions, 3 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index d9d5b5d..eb4497f 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -5,8 +5,9 @@
 CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
+. samizdat-paths.sh
 
-repo_execs=$(echo ./old-school/* loop-layer.sh samizdat-eject.sh)
+repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
 
@@ -22,6 +23,7 @@ graft_paths="
 absolute_path_copies='/lib/terminfo/l/linux'
 
 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
 modules='loop xts dm-crypt hfs hfsplus'
 modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 
@@ -31,8 +33,6 @@ modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls'
 for f in $repo_execs; do CopyExec "$f" /bin; done
 for c in $path_execs; do CopyExec "$(which $c)" /bin; done
 for f in $absolute_path_copies; do CopyExec "$f" "$f"; done
-samizdat_execs_dir=/home/d/src/samizdat # TODO
-for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done
 for m in $modules; do force_load "$m" || exit 1; done
 for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done