From 4f23c5d0c45649ba2bb7679c86561b006aee2dfe Mon Sep 17 00:00:00 2001 From: privb0x23 Date: Mon, 9 Oct 2017 21:34:26 +0000 Subject: [PATCH] Fix inclusion of libgcc_s.so on Void On Void Linux (x86_64 musl) libgcc_s.so is located in "/usr/lib" so it is not found by dracut and it produces an error. Add a simple additional path check for "/usr/lib/libgcc_s.so*" and install it in the initramfs. Reviewed-by: Brian Behlendorf Signed-off-by: privb0x23 Closes #6715 --- contrib/dracut/90zfs/module-setup.sh.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 7632cbccfc..71c81639b2 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -46,6 +46,9 @@ install() { # On systems with gcc-config (Gentoo, Funtoo, etc.): # Use the current profile to resolve the appropriate path dracut_install "/usr/lib/gcc/$(s=$(gcc-config -c); echo ${s%-*}/${s##*-})/libgcc_s.so.1" + elif [[ -n "$(ls /usr/lib/libgcc_s.so* 2>/dev/null)" ]]; then + # Try a simple path first + dracut_install /usr/lib/libgcc_s.so* else # Fallback: Guess the path and include all matches dracut_install /usr/lib/gcc/*/*/libgcc_s.so*