diff --git a/config/user-libfetch.m4 b/config/user-libfetch.m4
index f5149fc1a5d7..d961c6ca77a1 100644
--- a/config/user-libfetch.m4
+++ b/config/user-libfetch.m4
@@ -1,71 +1,71 @@
 dnl #
 dnl # Check for a libfetch - either fetch(3) or libcurl.
 dnl #
 dnl # There are two configuration dimensions:
 dnl #   * fetch(3) vs libcurl
 dnl #   * static vs dynamic
 dnl #
 dnl # fetch(3) is only dynamic.
 dnl # We use sover 6, which first appeared in FreeBSD 8.0-RELEASE.
 dnl #
 dnl # libcurl development packages include curl-config(1) – we want:
 dnl #   * HTTPS support
 dnl #   * version at least 7.16 (October 2006), for sover 4
 dnl #   * to decide if it's static or not
 dnl #
 AC_DEFUN([ZFS_AC_CONFIG_USER_LIBFETCH], [
 	AC_MSG_CHECKING([for libfetch])
 	LIBFETCH_LIBS=
 	LIBFETCH_IS_FETCH=0
 	LIBFETCH_IS_LIBCURL=0
 	LIBFETCH_DYNAMIC=0
 	LIBFETCH_SONAME=
 	have_libfetch=
 
 	saved_libs="$LIBS"
 	LIBS="$LIBS -lfetch"
 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 		#include <sys/param.h>
 		#include <stdio.h>
 		#include <fetch.h>
 	]], [fetchGetURL("", "");])], [
 		have_libfetch=1
 		LIBFETCH_IS_FETCH=1
 		LIBFETCH_DYNAMIC=1
-		LIBFETCH_SONAME='"libfetch.so.6"'
+		LIBFETCH_SONAME="libfetch.so.6"
 		LIBFETCH_LIBS="-ldl"
 		AC_MSG_RESULT([fetch(3)])
 	], [])
 	LIBS="$saved_libs"
 
 	if test -z "$have_libfetch"; then
 		if curl-config --protocols 2>/dev/null | grep -q HTTPS &&
 		    test "$(printf "%u" "0x$(curl-config --vernum)")" -ge "$(printf "%u" "0x071000")"; then
 			have_libfetch=1
 			LIBFETCH_IS_LIBCURL=1
 			if test "$(curl-config --built-shared)" = "yes"; then
 				LIBFETCH_DYNAMIC=1
-				LIBFETCH_SONAME='"libcurl.so.4"'
+				LIBFETCH_SONAME="libcurl.so.4"
 				LIBFETCH_LIBS="-ldl"
 				AC_MSG_RESULT([libcurl])
 			else
 				LIBFETCH_LIBS="$(curl-config --libs)"
 				AC_MSG_RESULT([libcurl (static)])
 			fi
 
 			CCFLAGS="$CCFLAGS $(curl-config --cflags)"
 		fi
 	fi
 
 	if test -z "$have_libfetch"; then
 		AC_MSG_RESULT([none])
 	fi
 
 	AC_SUBST([LIBFETCH_LIBS])
 	AC_SUBST([LIBFETCH_DYNAMIC])
 	AC_SUBST([LIBFETCH_SONAME])
 	AC_DEFINE_UNQUOTED([LIBFETCH_IS_FETCH], [$LIBFETCH_IS_FETCH], [libfetch is fetch(3)])
 	AC_DEFINE_UNQUOTED([LIBFETCH_IS_LIBCURL], [$LIBFETCH_IS_LIBCURL], [libfetch is libcurl])
 	AC_DEFINE_UNQUOTED([LIBFETCH_DYNAMIC], [$LIBFETCH_DYNAMIC], [whether the chosen libfetch is to be loaded at run-time])
-	AC_DEFINE_UNQUOTED([LIBFETCH_SONAME], [$LIBFETCH_SONAME], [soname of chosen libfetch])
+	AC_DEFINE_UNQUOTED([LIBFETCH_SONAME], ["$LIBFETCH_SONAME"], [soname of chosen libfetch])
 ])
diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in
index edc9955bf473..1eaff331eab4 100755
--- a/contrib/dracut/90zfs/module-setup.sh.in
+++ b/contrib/dracut/90zfs/module-setup.sh.in
@@ -1,143 +1,143 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2154
 
 check() {
 	# We depend on udev-rules being loaded
 	[ "${1}" = "-d" ] && return 0
 
 	# Verify the zfs tool chain
 	for tool in "@sbindir@/zgenhostid" "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do
 		test -x "$tool" || return 1
 	done
 
 	return 0
 }
 
 depends() {
 	echo udev-rules
 	return 0
 }
 
 installkernel() {
 	instmods zfs
 	instmods zcommon
 	instmods znvpair
 	instmods zavl
 	instmods zunicode
 	instmods zlua
 	instmods icp
 	instmods spl
 	instmods zlib_deflate
 	instmods zlib_inflate
 }
 
 install() {
 	inst_rules @udevruledir@/90-zfs.rules
 	inst_rules @udevruledir@/69-vdev.rules
 	inst_rules @udevruledir@/60-zvol.rules
 	dracut_install hostid
 	dracut_install grep
 	dracut_install @sbindir@/zgenhostid
 	dracut_install @sbindir@/zfs
 	dracut_install @sbindir@/zpool
 	# Workaround for https://github.com/openzfs/zfs/issues/4749 by
 	# ensuring libgcc_s.so(.1) is included
 	if ldd @sbindir@/zpool | grep -qF 'libgcc_s.so'; then
 		# Dracut will have already tracked and included it
 		:;
 	elif command -v gcc-config >/dev/null 2>&1; then
 		# On systems with gcc-config (Gentoo, Funtoo, etc.):
 		# Use the current profile to resolve the appropriate path
 		s="$(gcc-config -c)"
 		dracut_install "/usr/lib/gcc/${s%-*}/${s##*-}/libgcc_s.so"*
 	elif [ "$(echo /usr/lib/libgcc_s.so*)" != "/usr/lib/libgcc_s.so*" ]; then
 		# Try a simple path first
 		dracut_install /usr/lib/libgcc_s.so*
 	elif [ "$(echo /lib*/libgcc_s.so*)" != "/lib*/libgcc_s.so*" ]; then
 		# SUSE
 		dracut_install /lib*/libgcc_s.so*
 	else
 		# Fallback: Guess the path and include all matches
 		dracut_install /usr/lib*/gcc/**/libgcc_s.so*
 	fi
 	# shellcheck disable=SC2050
-	if [ @LIBFETCH_DYNAMIC@ != 0 ]; then
+	if [ @LIBFETCH_DYNAMIC@ -gt 0 ]; then
 		for d in $libdirs; do
-			[ -e "$d/"@LIBFETCH_SONAME@ ] && dracut_install "$d/"@LIBFETCH_SONAME@
+			[ -e "$d/@LIBFETCH_SONAME@" ] && dracut_install "$d/@LIBFETCH_SONAME@"
 		done
 	fi
 	dracut_install @mounthelperdir@/mount.zfs
 	dracut_install @udevdir@/vdev_id
 	dracut_install awk
 	dracut_install cut
 	dracut_install tr
 	dracut_install head
 	dracut_install @udevdir@/zvol_id
 	inst_hook cmdline 95 "${moddir}/parse-zfs.sh"
 	if [ -n "$systemdutildir" ] ; then
 		inst_script "${moddir}/zfs-generator.sh" "$systemdutildir"/system-generators/dracut-zfs-generator
 	fi
 	inst_hook pre-mount 90 "${moddir}/zfs-load-key.sh"
 	inst_hook mount 98 "${moddir}/mount-zfs.sh"
 	inst_hook cleanup 99 "${moddir}/zfs-needshutdown.sh"
 	inst_hook shutdown 20 "${moddir}/export-zfs.sh"
 
 	inst_simple "${moddir}/zfs-lib.sh" "/lib/dracut-zfs-lib.sh"
 	if [ -e @sysconfdir@/zfs/zpool.cache ]; then
 		inst @sysconfdir@/zfs/zpool.cache
 		type mark_hostonly >/dev/null 2>&1 && mark_hostonly @sysconfdir@/zfs/zpool.cache
 	fi
 
 	if [ -e @sysconfdir@/zfs/vdev_id.conf ]; then
 		inst @sysconfdir@/zfs/vdev_id.conf
 		type mark_hostonly >/dev/null 2>&1 && mark_hostonly @sysconfdir@/zfs/vdev_id.conf
 	fi
 
 	# Synchronize initramfs and system hostid
 	if [ -f @sysconfdir@/hostid ]; then
 		inst @sysconfdir@/hostid
 		type mark_hostonly >/dev/null 2>&1 && mark_hostonly @sysconfdir@/hostid
 	elif HOSTID="$(hostid 2>/dev/null)" && [ "${HOSTID}" != "00000000" ]; then
 		zgenhostid -o "${initdir}@sysconfdir@/hostid" "${HOSTID}"
 		type mark_hostonly >/dev/null 2>&1 && mark_hostonly @sysconfdir@/hostid
 	fi
 
 	if dracut_module_included "systemd"; then
 		mkdir -p "${initdir}/$systemdsystemunitdir/zfs-import.target.wants"
 		for _service in "zfs-import-scan.service" "zfs-import-cache.service" ; do
 			dracut_install "@systemdunitdir@/$_service"
 			if ! [ -L "${initdir}/$systemdsystemunitdir/zfs-import.target.wants/$_service" ]; then
 				ln -sf "../$_service" "${initdir}/$systemdsystemunitdir/zfs-import.target.wants/$_service"
 				type mark_hostonly >/dev/null 2>&1 && mark_hostonly "@systemdunitdir@/$_service"
 			fi
 		done
 
 		inst "${moddir}"/zfs-env-bootfs.service "${systemdsystemunitdir}"/zfs-env-bootfs.service
 		ln -s ../zfs-env-bootfs.service "${initdir}/${systemdsystemunitdir}/zfs-import.target.wants"/zfs-env-bootfs.service
 		type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-env-bootfs.service
 
 		dracut_install systemd-ask-password
 		dracut_install systemd-tty-ask-password-agent
 
 		mkdir -p "${initdir}/$systemdsystemunitdir/initrd.target.wants"
 		dracut_install @systemdunitdir@/zfs-import.target
 		if ! [ -L "${initdir}/$systemdsystemunitdir/initrd.target.wants"/zfs-import.target ]; then
 			ln -s ../zfs-import.target "${initdir}/$systemdsystemunitdir/initrd.target.wants"/zfs-import.target
 			type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-import.target
 		fi
 
 		for _service in zfs-snapshot-bootfs.service zfs-rollback-bootfs.service ; do
 			inst "${moddir}/$_service" "${systemdsystemunitdir}/$_service"
 			if ! [ -L "${initdir}/$systemdsystemunitdir/initrd.target.wants/$_service" ]; then
 				ln -s "../$_service" "${initdir}/$systemdsystemunitdir/initrd.target.wants/$_service"
 			fi
 		done
 
 		# There isn't a pkg-config variable for this,
 		# and dracut doesn't automatically resolve anything this'd be next to
 		local systemdsystemenvironmentgeneratordir
 		systemdsystemenvironmentgeneratordir="$(pkg-config --variable=prefix systemd || echo "/usr")/lib/systemd/system-environment-generators"
 		mkdir -p "${initdir}/${systemdsystemenvironmentgeneratordir}"
 		inst "${moddir}"/import-opts-generator.sh "${systemdsystemenvironmentgeneratordir}"/zfs-import-opts.sh
 	fi
 }
diff --git a/contrib/initramfs/hooks/zfs.in b/contrib/initramfs/hooks/zfs.in
index 9d5c397cf224..28dd252eea52 100755
--- a/contrib/initramfs/hooks/zfs.in
+++ b/contrib/initramfs/hooks/zfs.in
@@ -1,56 +1,56 @@
 #!/bin/sh
 #
 # Add OpenZFS filesystem capabilities to an initrd, usually for a native ZFS root.
 #
 
 if [ "$1" = "prereqs" ]; then
 	echo "udev"
 	exit
 fi
 
 . /usr/share/initramfs-tools/hook-functions
 
 for req in "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs"; do
 	copy_exec "$req" || {
 		echo "$req not available!" >&2
 		exit 2
 	}
 done
 
 copy_exec "@udevdir@/vdev_id"
 copy_exec "@udevdir@/zvol_id"
 if command -v systemd-ask-password > /dev/null; then
 	copy_exec "$(command -v systemd-ask-password)"
 fi
 
 # We use pthreads, but i-t from buster doesn't automatically
 # copy this indirect dependency: this can be removed when buster finally dies.
 find /lib/ -type f -name "libgcc_s.so.[1-9]" | while read -r libgcc; do
 	copy_exec "$libgcc"
 done
 
 # shellcheck disable=SC2050
-if [ @LIBFETCH_DYNAMIC@ != 0 ]; then
-	find /lib/ -name @LIBFETCH_SONAME@ | while read -r libfetch; do
+if [ @LIBFETCH_DYNAMIC@ -gt 0 ]; then
+	find /lib/ -name "@LIBFETCH_SONAME@" | while read -r libfetch; do
 		copy_exec "$libfetch"
 	done
 fi
 
 copy_file config "/etc/hostid"
 copy_file cache  "@sysconfdir@/zfs/zpool.cache"
 copy_file config "@initconfdir@/zfs"
 copy_file config "@sysconfdir@/zfs/zfs-functions"
 copy_file config "@sysconfdir@/zfs/vdev_id.conf"
 copy_file rule   "@udevruledir@/60-zvol.rules"
 copy_file rule   "@udevruledir@/69-vdev.rules"
 
 manual_add_modules zfs
 
 if [ -f "/etc/hostname" ]; then
 	copy_file config "/etc/hostname"
 else
 	hostname="$(mktemp -t hostname.XXXXXXXXXX)"
 	hostname > "$hostname"
 	copy_file config "$hostname" "/etc/hostname"
 	rm -f "$hostname"
 fi