diff options
author | Andrew Cady <d@jerkface.net> | 2019-10-06 12:57:26 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2019-10-06 12:57:26 -0400 |
commit | 5b289323280a3ead2440dc7022f89a29f5debe88 (patch) | |
tree | a2d6b444b8054307c694a97d7c1ec1fa3c48ddb2 /initramfs-tools/hooks/samizdat | |
parent | 5281a7fdd29e4535fc20865154bc2db50d9f6697 (diff) |
initramfs hook: improve error reporting
Diffstat (limited to 'initramfs-tools/hooks/samizdat')
-rwxr-xr-x | initramfs-tools/hooks/samizdat | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat index edbfb6d..2ab2333 100755 --- a/initramfs-tools/hooks/samizdat +++ b/initramfs-tools/hooks/samizdat | |||
@@ -2,7 +2,10 @@ | |||
2 | # TODO: check samizdat source to see what it copies | 2 | # TODO: check samizdat source to see what it copies |
3 | [ "$1" = prereqs ] && { echo; exit; } | 3 | [ "$1" = prereqs ] && { echo; exit; } |
4 | 4 | ||
5 | CopyExec() { copy_exec "$@" || exit 1; } | 5 | die() { printf 'Error: generating initramfs: %s\n' "$*" >&2; exit 1; } |
6 | |||
7 | CopyExec() { copy_exec "$@" || die "failed to copy_exec $*"; } | ||
8 | CopyExecE() { [ "$2" ] || die "cannot find binary to copy: $1"; shift; CopyExec "$@"; } | ||
6 | 9 | ||
7 | . /usr/share/initramfs-tools/hook-functions | 10 | . /usr/share/initramfs-tools/hook-functions |
8 | PATH=/usr/local/lib/samizdat-rhizome/initrd:/usr/local/bin:$PATH | 11 | PATH=/usr/local/lib/samizdat-rhizome/initrd:/usr/local/bin:$PATH |
@@ -26,19 +29,19 @@ absolute_path_copies='/lib/terminfo/l/linux /usr/bin/gpg-agent' | |||
26 | modules='loop xts dm-crypt hfs hfsplus' | 29 | modules='loop xts dm-crypt hfs hfsplus' |
27 | modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' | 30 | modules_dirs='kernel/drivers/net/ethernet kernel/fs/nls' |
28 | 31 | ||
29 | |||
30 | |||
31 | |||
32 | for f in $repo_execs; do CopyExec "$f" /bin; done | 32 | for f in $repo_execs; do CopyExec "$f" /bin; done |
33 | for c in $path_execs; do CopyExec "$(which $c)" /bin; done | 33 | for c in $path_execs; do |
34 | s=$(which $c) | ||
35 | CopyExecE "$c" "$s" /bin; | ||
36 | done | ||
34 | for f in $absolute_path_copies; do CopyExec "$f" "$f"; done | 37 | for f in $absolute_path_copies; do CopyExec "$f" "$f"; done |
35 | for m in $modules; do force_load "$m" || exit 1; done | 38 | for m in $modules; do force_load "$m" || die "command failed: force_load $m"; done |
36 | for dir in $modules_dirs; do copy_modules_dir "$dir" || exit 1; done | 39 | for dir in $modules_dirs; do copy_modules_dir "$dir" || die "command failed: copy_modules_dir $dir"; done |
37 | 40 | ||
38 | for e in $graft_paths; do | 41 | for e in $graft_paths; do |
39 | case "$e" in | 42 | case "$e" in |
40 | *=*) CopyExec "${e#*=}" "${e%%=*}" ;; | 43 | *=*) CopyExecE "graft_path $e" "${e#*=}" "${e%%=*}" ;; |
41 | *) exit 1 ;; | 44 | *) die "(BUG) invalid graft_path: $e" ;; |
42 | esac | 45 | esac |
43 | done | 46 | done |
44 | 47 | ||