diff options
| author | privb0x23 <[email protected]> | 2017-10-09 21:34:26 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-10-09 14:34:26 -0700 |
| commit | 4f23c5d0c45649ba2bb7679c86561b006aee2dfe (patch) | |
| tree | f77a25a9b763ebb1bff48e5e3253dd17240988ae /contrib/dracut | |
| parent | 57f4ef2e819670f8b28760b32745e0729f8d80d7 (diff) | |
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 <[email protected]>
Signed-off-by: privb0x23 <[email protected]>
Closes #6715
Diffstat (limited to 'contrib/dracut')
| -rwxr-xr-x | contrib/dracut/90zfs/module-setup.sh.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 7632cbccf..71c81639b 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* |