]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
fix: quote globbing in module-setup.sh for inst_multiple
authorZoltán Böszörményi <zboszor@pr.hu>
Sat, 30 Jan 2021 13:19:44 +0000 (14:19 +0100)
committerJóhann B. Guðmundsson <johannbg@gmail.com>
Tue, 9 Feb 2021 07:09:28 +0000 (07:09 +0000)
Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>
modules.d/35network-wicked/module-setup.sh
modules.d/90kernel-modules/module-setup.sh
modules.d/90nvdimm/module-setup.sh
modules.d/95fcoe/module-setup.sh
modules.d/95udev-rules/module-setup.sh

index 3541708b8d67dcecbeae360ba896d67d101d1563..8aa3c51d688bfbd43783862d6b47d4a8de9c08b5 100755 (executable)
@@ -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 \
index 6affae37872b48527bab15bbb8d47871e8ee42c3..02695a63dfcb1b737ea6fc1320890c0d11a031c8 100755 (executable)
@@ -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"
index 6d73d215853836c6bdf758791b06cca490c1a88a..043f5448b1805317964f694f4ba1a18c84a0d24d 100755 (executable)
@@ -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"
 }
index d98d5c0aef0b5ecfa1422994ca8e02f530b9bc63..32143d51fc2210cf536b8e3d5fbe4ddd38378d18 100755 (executable)
@@ -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"
index 580c9b763527ca4af75b75fdf76701c17e2b301c..dc1c736665409a3d3ba5365106755d2dafd8fe87 100755 (executable)
@@ -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
 
     {