Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

dracut/90/module-setup: mainly shellcheck cleanup 

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Issue #11956
This commit is contained in:
наб 2021-05-03 22:11:02 +02:00 committed by Brian Behlendorf
parent 1966e959ca
commit a27ab6d43b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/dracut/90zfs/module-setup.sh.in
View File

@ -8,8 +8,6 @@ check() {
for tool in "@sbindir@/zgenhostid" "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do for tool in "@sbindir@/zgenhostid" "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do
test -x "$tool" || return 1 test -x "$tool" || return 1
done done
# Verify grep exists
which grep >/dev/null 2>&1 || return 1
return 0 return 0
} }
@ -43,14 +41,15 @@ install() {
dracut_install @sbindir@/zpool dracut_install @sbindir@/zpool
# Workaround for https://github.com/openzfs/zfs/issues/4749 by # Workaround for https://github.com/openzfs/zfs/issues/4749 by
# ensuring libgcc_s.so(.1) is included # ensuring libgcc_s.so(.1) is included
if [[ -n "$(ldd @sbindir@/zpool | grep -F 'libgcc_s.so')" ]]; then if ldd @sbindir@/zpool | grep -qF 'libgcc_s.so'; then
# Dracut will have already tracked and included it # Dracut will have already tracked and included it
:; :;
elif command -v gcc-config 2>&1 1>/dev/null; then elif command -v gcc-config >/dev/null 2>&1; then
# On systems with gcc-config (Gentoo, Funtoo, etc.): # On systems with gcc-config (Gentoo, Funtoo, etc.):
# Use the current profile to resolve the appropriate path # 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" s="$(gcc-config -c)"
elif [[ -n "$(ls /usr/lib/libgcc_s.so* 2>/dev/null)" ]]; then dracut_install "/usr/lib/gcc/${s%-*}/${s##*-}/libgcc_s.so.1"
elif ls /usr/lib/libgcc_s.so* >/dev/null 2>&1; then
# Try a simple path first # Try a simple path first
dracut_install /usr/lib/libgcc_s.so* dracut_install /usr/lib/libgcc_s.so*
else else