From: Moritz Maxeiner <moritz@ucworks.org>
Date: Thu, 1 Sep 2016 16:15:10 +0000 (+0200)
Subject: Adapt genkernel fix for zfsonlinux/zfs#4749 to zfs dracut module
X-Git-Tag: zfs-0.7.0-rc2~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61c73494394fc9de9283b3fd4f00bcdf4bd300a7;p=zfs

Adapt genkernel fix for zfsonlinux/zfs#4749 to zfs dracut module

Signed-off-by: Moritz Maxeiner <moritz@ucworks.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #4749
Closes #5058
---

diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
index 70eac8790..6dff2a824 100755
--- a/contrib/dracut/90zfs/module-setup.sh.in
+++ b/contrib/dracut/90zfs/module-setup.sh.in
@@ -38,6 +38,12 @@ install() {
 	dracut_install grep
 	dracut_install @sbindir@/zfs
 	dracut_install @sbindir@/zpool
+	# Include libgcc_s.so.1 to workaround zfsonlinux/zfs#4749
+	if type gcc-config 2>&1 1>/dev/null; then
+		dracut_install "/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1"
+	else
+		dracut_install /usr/lib/gcc/*/*/libgcc_s.so.1
+	fi
 	dracut_install @sbindir@/mount.zfs
 	dracut_install @udevdir@/vdev_id
 	dracut_install @udevdir@/zvol_id