[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-17-g4f8d4b5

[Aron Xu]

The following commit has been merged in the master branch:
commit 04acc3c194931ee8a5faf39fe1182d1f8224efc9
Author: Aron Xu <aron at debian.org>
Date:   Mon Mar 13 12:13:19 2017 +0800

    Cherry-pick upstream fix for merged /usr/lib and /lib

diff --git a/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch b/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch
new file mode 100644
index 0000000..19efd63
--- /dev/null
+++ b/debian/patches/0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch
@@ -0,0 +1,31 @@
+From: Matt Kemp <matt at mattikus.com>
+Date: Mon, 27 Feb 2017 14:03:23 -0600
+Subject: 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 at llnl.gov>
+Signed-off-by: Matt Kemp <matt at mattikus.com>
+Closes #5834
+Applied-Upstream: https://github.com/zfsonlinux/zfs/commit/912e2ba92f45b61df476e7e15da33e0ea3eb0ae5
+---
+ contrib/initramfs/hooks/zfs | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs
+index 53e876d..dd796b6 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
diff --git a/debian/patches/series b/debian/patches/series
index df85d5b..e78391f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@ enable-zed.patch
 0296-Use-a-different-technique-to-detect-whether-to-mount.patch
 0334-Use-F-to-export-pools-so-as-not-to-dirty-up-device-l.patch
 0336-Properly-use-the-Dracut-cleanup-hook-to-order-pool-s.patch
+0020-Fix-initramfs-hook-for-merged-usr-lib-and-lib.patch

-- 
UNNAMED PROJECT