|
 |
9108dd |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
9108dd |
From: Luca BRUNO <luca.bruno@coreos.com>
|
|
|
9108dd |
Date: Fri, 24 Sep 2021 09:34:01 +0000
|
|
|
9108dd |
Subject: [PATCH] multipathd.socket: add missing conditions from service unit
|
|
|
9108dd |
|
|
|
9108dd |
Upstream Status: https://github.com/openSUSE/multipath-tools.git
|
|
|
9108dd |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008101
|
|
|
9108dd |
Conflicts: Match the conditions with RHEL-8 multipathd.service unit
|
|
|
9108dd |
|
|
|
9108dd |
commit 345ccf564ce7d904641bd32baf4fc53c2283d95c
|
|
|
9108dd |
Author: Luca BRUNO <luca.bruno@coreos.com>
|
|
|
9108dd |
Date: Fri Sep 24 09:34:01 2021 +0000
|
|
|
9108dd |
|
|
|
9108dd |
multipathd.socket: add missing conditions from service unit
|
|
|
9108dd |
|
|
|
9108dd |
This aligns 'multipathd' socket and service units, by adding the
|
|
|
9108dd |
start conditions that are set on the service but not on the socket.
|
|
|
9108dd |
It should help avoiding situations where the socket unit ends up
|
|
|
9108dd |
marked as failed after hitting its retry-limit.
|
|
|
9108dd |
|
|
|
9108dd |
Fixes: https://github.com/opensvc/multipath-tools/issues/15
|
|
|
9108dd |
Signed-off-by: Luca BRUNO <luca.bruno@coreos.com>
|
|
|
9108dd |
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
|
9108dd |
|
|
|
9108dd |
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
|
9108dd |
---
|
|
|
9108dd |
multipathd/multipathd.socket | 3 +++
|
|
|
9108dd |
1 file changed, 3 insertions(+)
|
|
|
9108dd |
|
|
|
9108dd |
diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
|
|
|
9108dd |
index 0ed4a1f7..c62c0fc8 100644
|
|
|
9108dd |
--- a/multipathd/multipathd.socket
|
|
|
9108dd |
+++ b/multipathd/multipathd.socket
|
|
|
9108dd |
@@ -1,6 +1,9 @@
|
|
|
9108dd |
[Unit]
|
|
|
9108dd |
Description=multipathd control socket
|
|
|
9108dd |
DefaultDependencies=no
|
|
|
9108dd |
+ConditionPathExists=/etc/multipath.conf
|
|
|
9108dd |
+ConditionKernelCommandLine=!nompath
|
|
|
9108dd |
+ConditionKernelCommandLine=!multipath=off
|
|
|
9108dd |
Before=sockets.target
|
|
|
9108dd |
|
|
|
9108dd |
[Socket]
|