From 9108dd9eef629e98197649be87ff36e541bc7556 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 26 2022 13:50:29 +0000
Subject: import device-mapper-multipath-0.8.4-17.el8_5.1


---

diff --git a/SOURCES/0077-multipathd.socket-add-missing-conditions-from-servic.patch b/SOURCES/0077-multipathd.socket-add-missing-conditions-from-servic.patch
new file mode 100644
index 0000000..3b1fb1c
--- /dev/null
+++ b/SOURCES/0077-multipathd.socket-add-missing-conditions-from-servic.patch
@@ -0,0 +1,43 @@
+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
+
+Upstream Status: https://github.com/openSUSE/multipath-tools.git
+Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2008101
+Conflicts: Match the conditions with RHEL-8 multipathd.service unit
+
+commit 345ccf564ce7d904641bd32baf4fc53c2283d95c
+Author: Luca BRUNO <luca.bruno@coreos.com>
+Date:   Fri Sep 24 09:34:01 2021 +0000
+
+    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..c62c0fc8 100644
+--- a/multipathd/multipathd.socket
++++ b/multipathd/multipathd.socket
+@@ -1,6 +1,9 @@
+ [Unit]
+ Description=multipathd control socket
+ DefaultDependencies=no
++ConditionPathExists=/etc/multipath.conf
++ConditionKernelCommandLine=!nompath
++ConditionKernelCommandLine=!multipath=off
+ Before=sockets.target
+ 
+ [Socket]
diff --git a/SPECS/device-mapper-multipath.spec b/SPECS/device-mapper-multipath.spec
index 88faf9d..f345ca6 100644
--- a/SPECS/device-mapper-multipath.spec
+++ b/SPECS/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.8.4
-Release: 17%{?dist}
+Release: 17%{?dist}.1
 License: GPLv2
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -87,6 +87,7 @@ Patch00073: 0073-multipath.conf-fix-typo-in-checker_timeout-descripti.patch
 Patch00074: 0074-mpathpersist-fail-commands-when-no-usable-paths-exis.patch
 Patch00075: 0075-multipath-print-warning-if-multipathd-is-not-running.patch
 Patch00076: 0076-multipathd-don-t-access-path-if-it-was-deleted.patch
+Patch00077: 0077-multipathd.socket-add-missing-conditions-from-servic.patch
 
 # runtime
 Requires: %{name}-libs = %{version}-%{release}
@@ -288,6 +289,10 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Thu Feb 17 2022 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-17.1
+- Add 0077-multipathd.socket-add-missing-conditions-from-servic.patch
+- Resolves: bz #2054877
+
 * Fri Jul 23 2021 Benjamin Marzinski <bmarzins@redhat.com> 0.8.4-17
 - Add 0074-mpathpersist-fail-commands-when-no-usable-paths-exis.patch
   * Fixes bz #1984723