remove more samizdat-paths cruft

1 files changed, 8 insertions, 11 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index b6451eb..1d4c1fe 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -1,32 +1,29 @@
 #!/bin/sh
-# TODO: check samizdat source to see what it copies
 [ "$1" = prereqs ] && { echo; exit; }
 
+. /usr/share/initramfs-tools/hook-functions
+
 die() { printf 'Error: generating initramfs: %s\n' "$*" >&2; exit 1; }
 
 CopyExec() { copy_exec "$@" || die "failed to copy_exec $*"; }
 CopyExecE() { [ "$2" ] || die "cannot find binary to copy: $1"; shift; CopyExec "$@"; }
 
-. /usr/share/initramfs-tools/hook-functions
-PATH=/usr/local/lib/samizdat-rhizome/initrd:/usr/local/bin:$PATH
-. samizdat-paths.sh
+SAMIZDAT_INITRD_PATH=/usr/local/lib/samizdat-rhizome/initrd
+
+PATH=${SAMIZDAT_INITRD_PATH}:/usr/local/bin:$PATH
 
-repo_execs=$(echo "${samizdat_initrd_files_dir}"/*)
+repo_execs=$(echo "${SAMIZDAT_INITRD_PATH}"/*)
 
 path_execs='
     mountpoint openvt rsync gpg2 pinentry-curses truncate dmsetup
     dmstats cryptsetup mkfs.btrfs btrfs fsck.hfsplus wait_for_files
-    samizdat-pinentry dynmenu samizdat-password-agent samizdat-gpg-agent
-    parted fallocate strace btrfstune sfdisk
+    dynmenu parted fallocate strace btrfstune sfdisk
 '
 
 graft_paths="
     /bin/OpenVT=/bin/openvt
     /bin/LoSetup=/sbin/losetup
-    /patchroot/patchroot.sh=${samizdat_initrd_files_dir}/patchroot.sh
-    /patchroot/sources.list=/etc/apt/sources.list
-    /patchroot/initrd-dependencies.txt=${samizdat_initrd_files_dir}/initrd-dependencies.txt
-    /lib/samizdat/vol_id.txt=${samizdat_initrd_files_dir}/vol_id.txt
+    /patchroot/patchroot.sh=${SAMIZDAT_INITRD_PATH}/patchroot.sh
 "
 
 absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent'