19ddc43848
Update Source to upstream version 0.8.7 plus upstream staged commits
* Previous patches 0011-0016 & 0018-0022 are included in the source
tarball
* Fixes bz#2017592
Rename files
* Previous patches 0001-0010 are now patches 0013-0022
Modify 0018-RH-add-mpathconf.patch
* merged with previous patch 0017
Add 0023-libmulitpath-add-section-name-to-invalid-keyword-out.patch
* Fixes bz#1984303
Fix multipath_conf_syntax test to work with bz #1984303
Resolves: bz #1984303, #2017592
33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 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>
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.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]
|