This aligns 'multipathd' socket and service units, by adding the start conditions that are set on the service but not on the socket. It should help avoiding situations where the socket unit ends up marked as failed after hitting its retry-limit. (cherry picked from commit d51e66c57b798f4f22bde28d72f4c11afd474f7e)
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
From 4167af5bddb9fb1003e7919432e6cc24469ee166 Mon Sep 17 00:00:00 2001
|
|
From: Luca BRUNO <luca.bruno@coreos.com>
|
|
Date: Fri, 24 Sep 2021 09:34:01 +0000
|
|
Subject: [PATCH] multipathd.socket: add missing conditions from service unit
|
|
|
|
This aligns 'multipathd' socket and service units, by adding the
|
|
start conditions that are set on the service but not on the socket.
|
|
It should help avoiding situations where the socket unit ends up
|
|
marked as failed after hitting its retry-limit.
|
|
|
|
Fixes: https://github.com/opensvc/multipath-tools/issues/15
|
|
Signed-off-by: Luca BRUNO <luca.bruno@coreos.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
multipathd/multipathd.socket | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
|
|
index 0ed4a1f7..c777e5e3 100644
|
|
--- a/multipathd/multipathd.socket
|
|
+++ b/multipathd/multipathd.socket
|
|
@@ -1,6 +1,9 @@
|
|
[Unit]
|
|
Description=multipathd control socket
|
|
DefaultDependencies=no
|
|
+ConditionKernelCommandLine=!nompath
|
|
+ConditionKernelCommandLine=!multipath=off
|
|
+ConditionVirtualization=!container
|
|
Before=sockets.target
|
|
|
|
[Socket]
|
|
--
|
|
2.23.0
|
|
|