fix(90multipath): create `/etc/multipath` only

The dropins path is `/etc/multipath/conf.d`, not
`/etc/multipath/multipath.conf.d`:

https://github.com/opensvc/multipath-tools/blob/686797b7d0da4fc24fdfcb0fc6364df78a0b232d/Makefile.inc#L100

But anyway, we don't need to create that directory. We only need to
create `/etc/multipath`.

While we're here, add a comment to explain this.

diff --git a/modules.d/90multipath/multipathd-configure.service b/modules.d/90multipath/multipathd-configure.service
index de690615452084341b28abdc777ce8de5d22a4be..08969d92404926711b7487c3642d9ace70369040 100644 (file)
--- a/modules.d/90multipath/multipathd-configure.service
+++ b/modules.d/90multipath/multipathd-configure.service
@@ -12,7 +12,8 @@ ConditionPathExists=!/etc/multipath.conf
 
 [Service]
 Type=oneshot
-ExecStartPre=-/usr/bin/mkdir -p /etc/multipath/multipath.conf.d
+# mpathconf requires /etc/multipath to already exist
+ExecStartPre=-/usr/bin/mkdir -p /etc/multipath
 ExecStart=/usr/sbin/mpathconf --enable
 
 [Install]

diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh
index 385a95fb18f6da3cbdf471f6915e135ed9173052..0f45474a8def3853d18de66db2854c5beffe3cd5 100755 (executable)
--- a/modules.d/90multipath/multipathd.sh
+++ b/modules.d/90multipath/multipathd.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
 if [ "$(getarg rd.multipath)" = "default" ] && [ ! -e /etc/multipath.conf ]; then
-    mkdir -p /etc/multipath/multipath.conf.d
+    # mpathconf requires /etc/multipath to already exist
+    mkdir -p /etc/multipath
     mpathconf --enable
 fi