Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix initramfs hook for merged /usr/lib and /lib
Under a merged `/lib` -> `/usr/lib` which renders `/lib` as a symlink,
`find /lib -type f -name libgcc_s.so.1` will not return a result as
`find` will not traverse the symlink. Modifying it to `find /lib/ -type
f -name libgcc_s.so.1` should work for both symlinked and non-symlinked
`/lib` directories.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Kemp <matt@mattikus.com>
Closes #5834
  • Loading branch information
mattikus authored and behlendorf committed Feb 27, 2017
1 parent 66eead5 commit 912e2ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/initramfs/hooks/zfs
Expand Up @@ -55,7 +55,7 @@ mkdir -p "$DESTDIR/etc/"
# automatically detected. The `find` utility and extended `cp` options are
# used here because libgcc_s.so could be in a subdirectory of /lib for
# multi-arch installations.
cp --target-directory="$DESTDIR" --parents $(find /lib -type f -name libgcc_s.so.1)
cp --target-directory="$DESTDIR" --parents $(find /lib/ -type f -name libgcc_s.so.1)

for ii in $COPY_EXEC_LIST
do
Expand Down

0 comments on commit 912e2ba

Please sign in to comment.