more path fixes

1 files changed, 6 insertions, 3 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index eb4497f..db2fd1c 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -5,8 +5,11 @@
 CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
+PATH=/usr/local/bin:$PATH
 . samizdat-paths.sh
 
+set -x
+
 repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
 
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
@@ -14,10 +17,10 @@ path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryp
 graft_paths="
     /bin/OpenVT=/bin/openvt
     /bin/LoSetup=/sbin/losetup
-    /patchroot/patchroot.sh=patchroot.sh
+    /patchroot/patchroot.sh=${samizdat_initrd_files_dir}/patchroot.sh
     /patchroot/sources.list=/etc/apt/sources.list
-    /patchroot/initrd-dependencies.txt=initrd-dependencies.txt
-    /lib/samizdat/vol_id.txt=vol_id.txt
+    /patchroot/initrd-dependencies.txt=${samizdat_initrd_files_dir}/initrd-dependencies.txt
+    /lib/samizdat/vol_id.txt=${samizdat_initrd_files_dir}/vol_id.txt
 "
 
 absolute_path_copies='/lib/terminfo/l/linux'