]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
fix: quotes in systemd modules
authorJóhann B. Guðmundsson <johannbg@gmail.com>
Thu, 22 Apr 2021 20:20:15 +0000 (20:20 +0000)
committerHarald Hoyer <harald@hoyer.xyz>
Fri, 23 Apr 2021 08:56:51 +0000 (10:56 +0200)
Fixing quotes around *.conf in systemd modules

modules.d/01systemd-coredump/module-setup.sh
modules.d/01systemd-repart/module-setup.sh
modules.d/01systemd-sysctl/module-setup.sh
modules.d/01systemd-sysusers/module-setup.sh

index 6dde78f90fbbb812d79a767f4ddfeff56fe0dca1..0eed4652bb095339b88f58ab13c63f40845bd5c6 100755 (executable)
@@ -43,11 +43,11 @@ install() {
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
             "$systemdutilconfdir"/coredump.conf \
-            "$systemdsystemconfdir"/coredump.conf.d/*.conf \
+            "$systemdsystemconfdir/coredump.conf.d/*.conf" \
             "$systemdsystemconfdir"/systemd-coredump.socket \
-            "$systemdsystemconfdir"/systemd-coredump.socket.d/*.conf \
+            "$systemdsystemconfdir/systemd-coredump.socket.d/*.conf" \
             "$systemdsystemconfdir"/systemd-coredump@.service \
-            "$systemdsystemconfdir"/systemd-coredump@.service.d/*.conf \
+            "$systemdsystemconfdir/systemd-coredump@.service.d/*.conf" \
             "$systemdsystemconfdir"/sockets.target.wants/systemd-coredump.socket
     fi
 }
index fc5c5acb1468a2606e303ef45190d3e3ce3fde2d..eb4e0593386a884e4a8e5747ef1f44667d8c9dd1 100755 (executable)
@@ -5,7 +5,7 @@
 # Prerequisite check(s) for module.
 check() {
 
-    # If the binary(s) requirements are not fulfilled the module can't be installed
+    # If the binary(s) requirements are not fulfilled the module can't be installed.
     require_binaries systemd-repart || return 1
 
     # Return 255 to only include the module, if another module requires it.
@@ -25,7 +25,7 @@ depends() {
 install() {
 
     inst_multiple -o \
-        "$libdir"/repart.d/*.conf \
+        "$libdir/repart.d/*.conf" \
         "$systemdsystemunitdir"/systemd-repart.service \
         "$systemdsystemunitdir"/initrd-root-fs.target.wants/systemd-repart.service \
         systemd-repart
@@ -33,8 +33,8 @@ install() {
     # Install the hosts local user configurations if enabled.
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
-            /etc/repart.d/*.conf \
+            "/etc/repart.d/*.conf" \
             "$systemdsystemconfdir"/systemd-repart.service \
-            "$systemdsystemconfdir"/systemd-repart.service.d/*.conf
+            "$systemdsystemconfdir/systemd-repart.service.d/*.conf"
     fi
 }
index cc4fae6d940c3da136417709795fbc33e0330503..ad52614c9199eebdbcfda1d2ded08df4e39b78a2 100755 (executable)
@@ -27,7 +27,7 @@ depends() {
 install() {
 
     inst_multiple -o \
-        "$sysctld"/*.conf \
+        "$sysctld/*.conf" \
         "$systemdsystemunitdir"/systemd-sysctl.service \
         "$systemdsystemunitdir"/sysinit.target.wants/systemd-sysctl.service \
         "$systemdutildir"/systemd-sysctl
@@ -36,9 +36,9 @@ install() {
     if [[ $hostonly ]]; then
         inst_multiple -H -o \
             /etc/sysctl.conf \
-            "$sysctlconfdir"/*.conf \
+            "$sysctlconfdir/*.conf" \
             "$systemdsystemconfdir"/systemd-sysctl.service \
-            "$systemdsystemconfdir"/systemd-sysctl.service.d/*.conf
+            "$systemdsystemconfdir/systemd-sysctl.service.d/*.conf"
     fi
 
     # Enable the systemd type service unit for sysctl.
index f0924dfaf717650ef64879413eef05a47daa94dc..58894f5011d9219e7ee6e6f854a9494d68fa13b1 100644 (file)
@@ -41,7 +41,7 @@ install() {
             "$sysusersconfdir"/basic.conf \
             "$sysusersconfdir"/systemd.conf \
             "$systemdsystemconfdir"/systemd-sysusers.service \
-            "$systemdsystemconfdir"/systemd-sysusers.service.d/*.conf
+            "$systemdsystemconfdir/systemd-sysusers.service.d/*.conf"
     fi
 
     # Enable the systemd type service unit for sysusers.