diff options
author | Andrew Cady <d@jerkface.net> | 2016-04-29 14:36:26 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2016-04-29 14:36:30 -0400 |
commit | 153d299a41b9be4e15dab1ca29bb93a74bd2445d (patch) | |
tree | 96fbfbe7c64f0b3f02f3d755e2b129917785bb98 /initramfs-tools/hooks/samizdat | |
parent | 5f41fb879ca830e5ad3345878e59072f3d6573bc (diff) |
fix paths (in progress)
Diffstat (limited to 'initramfs-tools/hooks/samizdat')
-rwxr-xr-x | initramfs-tools/hooks/samizdat | 6 |
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 @@ | |||
5 | CopyExec() { copy_exec "$@" || exit 1; } | 5 | CopyExec() { copy_exec "$@" || exit 1; } |
6 | 6 | ||
7 | . /usr/share/initramfs-tools/hook-functions | 7 | . /usr/share/initramfs-tools/hook-functions |
8 | . samizdat-paths.sh | ||
8 | 9 | ||
9 | repo_execs=$(echo ./old-school/* loop-layer.sh samizdat-eject.sh) | 10 | repo_execs=$(echo "${samizdat_initrd_files_dir}"/*) |
10 | 11 | ||
11 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' | 12 | path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus' |
12 | 13 | ||
@@ -22,6 +23,7 @@ graft_paths=" | |||
22 | absolute_path_copies='/lib/terminfo/l/linux' | 23 | absolute_path_copies='/lib/terminfo/l/linux' |
23 | 24 | ||
24 | samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent' | 25 | samizdat_execs='wait_for_files samizdat-pinentry dynmenu src/samizdat-password-agent src/samizdat-gpg-agent' |
26 | for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done | ||
25 | modules='loop xts dm-crypt hfs hfsplus' | 27 | modules='loop xts dm-crypt hfs hfsplus' |
26 | modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' | 28 | modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' |
27 | 29 | ||
@@ -31,8 +33,6 @@ modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' | |||
31 | for f in $repo_execs; do CopyExec "$f" /bin; done | 33 | for f in $repo_execs; do CopyExec "$f" /bin; done |
32 | for c in $path_execs; do CopyExec "$(which $c)" /bin; done | 34 | for c in $path_execs; do CopyExec "$(which $c)" /bin; done |
33 | for f in $absolute_path_copies; do CopyExec "$f" "$f"; done | 35 | for f in $absolute_path_copies; do CopyExec "$f" "$f"; done |
34 | samizdat_execs_dir=/home/d/src/samizdat # TODO | ||
35 | for c in $samizdat_execs; do CopyExec ${samizdat_execs_dir}/$c /bin; done | ||
36 | for m in $modules; do force_load "$m" || exit 1; done | 36 | for m in $modules; do force_load "$m" || exit 1; done |
37 | for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done | 37 | for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done |
38 | 38 | ||