multipath: install by default, but run only if wwids are present

diff --git a/modules.d/90multipath/check b/modules.d/90multipath/check
index cae205231615cb0226f7fccf4db2773e95789061..b1834b524a6c4bfce32ede9b0c136b6ebc61173a 100755 (executable)
--- a/modules.d/90multipath/check
+++ b/modules.d/90multipath/check
@@ -14,10 +14,12 @@ is_mpath() {
     return 1
 }
 
-# Do mpath if we appear to be using it for /
-rootdev=$(find_root_block_device)
-if [[ $rootdev ]]; then
-    check_block_and_slaves is_mpath "$rootdev" && exit 0
+if [[ $1 = -h ]]; then
+    rootdev=$(find_root_block_device)
+    if [[ $rootdev ]]; then
+        check_block_and_slaves is_mpath "$rootdev" && exit 0
+    fi
+    exit 1
 fi
 
-exit 1
+exit 0
\ No newline at end of file

diff --git a/modules.d/90multipath/multipathd.sh b/modules.d/90multipath/multipathd.sh
index e26ab84ef22b0694bac2f7442bff6b0d20076471..c9a2b3f236cdc394c448e2557d350e7df7546805 100755 (executable)
--- a/modules.d/90multipath/multipathd.sh
+++ b/modules.d/90multipath/multipathd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ -e /etc/multipath.conf ]; then
+if [ -e /etc/multipath.conf -a -e /etc/multipath/wwids ]; then
     modprobe dm-multipath
     multipathd
 else