From 03d132a76c4ef40c4b6007af6f1cf42e5426ee44 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zolt=C3=A1n=20B=C3=B6sz=C3=B6rm=C3=A9nyi?= Date: Sat, 30 Jan 2021 14:19:44 +0100 Subject: [PATCH] fix: quote globbing in module-setup.sh for inst_multiple MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Zoltán Böszörményi --- modules.d/35network-wicked/module-setup.sh | 14 +++++++------- modules.d/90kernel-modules/module-setup.sh | 2 +- modules.d/90nvdimm/module-setup.sh | 2 +- modules.d/95fcoe/module-setup.sh | 2 +- modules.d/95udev-rules/module-setup.sh | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules.d/35network-wicked/module-setup.sh b/modules.d/35network-wicked/module-setup.sh index 3541708b8..8aa3c51d6 100755 --- a/modules.d/35network-wicked/module-setup.sh +++ b/modules.d/35network-wicked/module-setup.sh @@ -36,13 +36,13 @@ install() { inst_dir /usr/lib/wicked/bin inst_dir /var/lib/wicked - inst_multiple /etc/wicked/*.xml - inst_multiple /etc/wicked/extensions/* - inst_multiple /etc/dbus-1/system.d/org.opensuse.Network* - inst_multiple /usr/share/wicked/schema/* - inst_multiple /usr/lib/wicked/bin/* - inst_multiple /usr/libexec/wicked/bin/* - inst_multiple /usr/sbin/wicked* + inst_multiple "/etc/wicked/*.xml" + inst_multiple "/etc/wicked/extensions/*" + inst_multiple "/etc/dbus-1/system.d/org.opensuse.Network*" + inst_multiple "/usr/share/wicked/schema/*" + inst_multiple "/usr/lib/wicked/bin/*" + inst_multiple "/usr/libexec/wicked/bin/*" + inst_multiple "/usr/sbin/wicked*" wicked_units=" $systemdsystemunitdir/wickedd.service \ diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh index 6affae378..02695a63d 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -140,7 +140,7 @@ installkernel() { # called by dracut install() { - inst_multiple -o /lib/modprobe.d/*.conf + inst_multiple -o "/lib/modprobe.d/*.conf" [[ $hostonly ]] && inst_multiple -H -o /etc/modprobe.d/*.conf /etc/modprobe.conf if ! dracut_module_included "systemd"; then inst_hook cmdline 01 "$moddir/parse-kernel.sh" diff --git a/modules.d/90nvdimm/module-setup.sh b/modules.d/90nvdimm/module-setup.sh index 6d73d2158..043f5448b 100755 --- a/modules.d/90nvdimm/module-setup.sh +++ b/modules.d/90nvdimm/module-setup.sh @@ -27,5 +27,5 @@ installkernel() { # called by dracut install() { - inst_multiple -o ndctl /etc/ndctl/keys/tpm.handle /etc/ndctl/keys/*.blob + inst_multiple -o ndctl /etc/ndctl/keys/tpm.handle "/etc/ndctl/keys/*.blob" } diff --git a/modules.d/95fcoe/module-setup.sh b/modules.d/95fcoe/module-setup.sh index d98d5c0ae..32143d51f 100755 --- a/modules.d/95fcoe/module-setup.sh +++ b/modules.d/95fcoe/module-setup.sh @@ -103,7 +103,7 @@ install() { local _fcoeconf=$(cmdline) [[ $_fcoeconf ]] && printf "%s\n" "$_fcoeconf" >> "${initdir}/etc/cmdline.d/95fcoe.conf" fi - inst_multiple /etc/fcoe/cfg-* + inst_multiple "/etc/fcoe/cfg-*" inst "$moddir/fcoe-up.sh" "/sbin/fcoe-up" inst "$moddir/fcoe-edd.sh" "/sbin/fcoe-edd" diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh index 580c9b763..dc1c73666 100755 --- a/modules.d/95udev-rules/module-setup.sh +++ b/modules.d/95udev-rules/module-setup.sh @@ -59,8 +59,8 @@ install() { [[ $hostonly ]] && inst_rules 70-persistent-net.rules if dracut_module_included "systemd"; then - inst_multiple -o ${systemdutildir}/network/*.link - [[ $hostonly ]] && inst_multiple -H -o /etc/systemd/network/*.link + inst_multiple -o ${systemdutildir}"/network/*.link" + [[ $hostonly ]] && inst_multiple -H -o "/etc/systemd/network/*.link" fi { -- 2.47.3