diff options
-rwxr-xr-x | make | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1,19 +1,9 @@ #!/bin/sh -toppid=$$ -die() { - fmt=$1 - shift - printf "error building initramfs: $fmt\n" "$@" >&2 - kill "$toppid" - trap '' EXIT - exit 1 -} - # generate a cpio entry for a command gen_cmd() { cmd=$1 - cmdp="$(command -v "$cmd")" || die 'command not found: %s' "$cmd" + cmdp="$(command -v "$cmd")" || exit 1 # ignore builtins [ "$cmd" != "$cmdp" ] || return printf 'file %s %s 0755 0 0\n' "$cmdp" "$cmdp" @@ -27,7 +17,7 @@ gen_cpio_list() { gen_cmd e2fsck gen_cmd dropbear gen_cmd cryptsetup - ldconfig -p | awk '$1 == "libgcc_s.so.1" && $2 ~ /x86-64/ { print "file " $4 " " $4 " 0755 0 0" }' + ldconfig -p | awk '$1 == "libgcc_s.so.1" && $2 ~ /x86-64/ { print "file /lib64/" $1 " " $4 " 0755 0 0" }' } # filter the list and insert parent directory entries |