diff options
| author | Matt Kemp <[email protected]> | 2017-02-27 14:03:23 -0600 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-02-27 12:03:23 -0800 |
| commit | 912e2ba92f45b61df476e7e15da33e0ea3eb0ae5 (patch) | |
| tree | 097c97c8d7e52e10b4139381046567a6b5bce852 | |
| parent | 66eead53c9d2480f2a464ef170920953431ad200 (diff) | |
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 <[email protected]>
Signed-off-by: Matt Kemp <[email protected]>
Closes #5834
| -rwxr-xr-x | contrib/initramfs/hooks/zfs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs index 53e876d33..dd796b6ff 100755 --- a/contrib/initramfs/hooks/zfs +++ b/contrib/initramfs/hooks/zfs @@ -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 |