|
 |
3610a11 |
From 8134db6c335b28b6bd58bac4ef4c2236cc9ea06a Mon Sep 17 00:00:00 2001
|
|
|
3610a11 |
From: Harald Hoyer <harald@hoyer.xyz>
|
|
|
3610a11 |
Date: Tue, 19 Dec 2017 15:43:58 +0100
|
|
|
3610a11 |
Subject: [PATCH] Merge pull request #321 from danimo/multipath-fixes
|
|
|
3610a11 |
|
|
|
3610a11 |
SUSE fixes for 90multipath
|
|
|
3610a11 |
---
|
|
|
3610a11 |
modules.d/90multipath/module-setup.sh | 1 +
|
|
|
3610a11 |
modules.d/90multipath/multipath-shutdown.sh | 7 +++++++
|
|
|
3610a11 |
modules.d/90multipath/multipathd-needshutdown.sh | 9 +++++----
|
|
|
3610a11 |
modules.d/90multipath/multipathd.service | 5 ++++-
|
|
|
3610a11 |
4 files changed, 17 insertions(+), 5 deletions(-)
|
|
|
3610a11 |
|
|
|
3610a11 |
diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
|
|
|
3610a11 |
index 0a680b17..983f6f24 100755
|
|
|
3610a11 |
--- a/modules.d/90multipath/module-setup.sh
|
|
|
3610a11 |
+++ b/modules.d/90multipath/module-setup.sh
|
|
|
3610a11 |
@@ -89,6 +89,7 @@ install() {
|
|
|
3610a11 |
fi
|
|
|
3610a11 |
|
|
|
3610a11 |
inst_hook cleanup 80 "$moddir/multipathd-needshutdown.sh"
|
|
|
3610a11 |
+ inst_hook shutdown 20 "$moddir/multipath-shutdown.sh"
|
|
|
3610a11 |
|
|
|
3610a11 |
inst_rules 40-multipath.rules 56-multipath.rules \
|
|
|
3610a11 |
62-multipath.rules 65-multipath.rules \
|
|
|
3610a11 |
diff --git a/modules.d/90multipath/multipath-shutdown.sh b/modules.d/90multipath/multipath-shutdown.sh
|
|
|
3610a11 |
new file mode 100755
|
|
|
3610a11 |
index 00000000..47e9990c
|
|
|
3610a11 |
--- /dev/null
|
|
|
3610a11 |
+++ b/modules.d/90multipath/multipath-shutdown.sh
|
|
|
3610a11 |
@@ -0,0 +1,7 @@
|
|
|
3610a11 |
+#!/bin/bash
|
|
|
3610a11 |
+
|
|
|
3610a11 |
+for i in $(multipath -l -v1); do
|
|
|
3610a11 |
+ if ! $(dmsetup table $i | sed -n '/.*queue_if_no_path.*/q1') ; then
|
|
|
3610a11 |
+ dmsetup message $i 0 fail_if_no_path
|
|
|
3610a11 |
+ fi
|
|
|
3610a11 |
+done
|
|
|
3610a11 |
diff --git a/modules.d/90multipath/multipathd-needshutdown.sh b/modules.d/90multipath/multipathd-needshutdown.sh
|
|
|
3610a11 |
index 214abd3a..ee9b69b4 100755
|
|
|
3610a11 |
--- a/modules.d/90multipath/multipathd-needshutdown.sh
|
|
|
3610a11 |
+++ b/modules.d/90multipath/multipathd-needshutdown.sh
|
|
|
3610a11 |
@@ -1,7 +1,8 @@
|
|
|
3610a11 |
#!/bin/sh
|
|
|
3610a11 |
|
|
|
3610a11 |
-for i in /dev/mapper/mpath*; do
|
|
|
3610a11 |
- [ -b "$i" ] || continue
|
|
|
3610a11 |
- need_shutdown
|
|
|
3610a11 |
- break
|
|
|
3610a11 |
+for i in $(multipath -l -v1); do
|
|
|
3610a11 |
+ if $(dmsetup table $i | sed -n '/.*queue_if_no_path.*/q1') ; then
|
|
|
3610a11 |
+ need_shutdown
|
|
|
3610a11 |
+ break
|
|
|
3610a11 |
+ fi
|
|
|
3610a11 |
done
|
|
|
3610a11 |
diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service
|
|
|
3610a11 |
index b64b02cd..0554d954 100644
|
|
|
3610a11 |
--- a/modules.d/90multipath/multipathd.service
|
|
|
3610a11 |
+++ b/modules.d/90multipath/multipathd.service
|
|
|
3610a11 |
@@ -1,12 +1,15 @@
|
|
|
3610a11 |
[Unit]
|
|
|
3610a11 |
Description=Device-Mapper Multipath Device Controller
|
|
|
3610a11 |
Before=iscsi.service iscsid.service lvm2-activation-early.service
|
|
|
3610a11 |
+Wants=systemd-udev-trigger.service systemd-udev-settle.service local-fs-pre.target
|
|
|
3610a11 |
+After=systemd-udev-trigger.service systemd-udev-settle.service
|
|
|
3610a11 |
+Before=local-fs-pre.target
|
|
|
3610a11 |
DefaultDependencies=no
|
|
|
3610a11 |
Conflicts=shutdown.target
|
|
|
3610a11 |
ConditionKernelCommandLine=!nompath
|
|
|
3610a11 |
ConditionKernelCommandLine=!rd.multipath=0
|
|
|
3610a11 |
ConditionKernelCommandLine=!rd_NO_MULTIPATH
|
|
|
3610a11 |
-ConditionPathExists=/etc/multipath.conf
|
|
|
3610a11 |
+ConditionKernelCommandLine=!multipath=off
|
|
|
3610a11 |
|
|
|
3610a11 |
[Service]
|
|
|
3610a11 |
Type=simple
|
|
|
3610a11 |
|