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

contrib/initrd hooks: properly quote @LIBFETCH_SONAME@ 

Bullseye shellcheck picks these up as SC2140, and it's right!
@LIBFETCH_SONAME@ is already quoted, so dracut had
  "$d/"libcurl.so.4""
and i-t had
  ""libcurl.so.4""

Partially reverts 34eef3e9a7 (#12760),
which broke this

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12835
This commit is contained in:
наб 2021-12-11 02:41:23 +01:00 committed by Brian Behlendorf
parent 1f63c64559
commit 153f7c9f72
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,9 +61,9 @@ install() {
dracut_install /usr/lib*/gcc/**/libgcc_s.so* dracut_install /usr/lib*/gcc/**/libgcc_s.so*
fi fi
# shellcheck disable=SC2050 # shellcheck disable=SC2050
if [ "@LIBFETCH_DYNAMIC@" != 0 ]; then if [ @LIBFETCH_DYNAMIC@ != 0 ]; then
for d in $libdirs; do for d in $libdirs; do
[ -e "$d/@LIBFETCH_SONAME@" ] && dracut_install "$d/@LIBFETCH_SONAME@" [ -e "$d/"@LIBFETCH_SONAME@ ] && dracut_install "$d/"@LIBFETCH_SONAME@
done done
fi fi
dracut_install @mounthelperdir@/mount.zfs dracut_install @mounthelperdir@/mount.zfs

4
contrib/initramfs/hooks/zfs.in
View File

@ -30,8 +30,8 @@ find /lib/ -type f -name "libgcc_s.so.[1-9]" | while read -r libgcc; do
done done
# shellcheck disable=SC2050 # shellcheck disable=SC2050
if [ "@LIBFETCH_DYNAMIC@" != 0 ]; then if [ @LIBFETCH_DYNAMIC@ != 0 ]; then
find /lib/ -name "@LIBFETCH_SONAME@" | while read -r libfetch; do find /lib/ -name @LIBFETCH_SONAME@ | while read -r libfetch; do
copy_exec "$libfetch" copy_exec "$libfetch"
done done
fi fi