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.

0028-multipathd.socket-add-missing-conditions-from-servic.patch

@@ -0,0 +1,34 @@
+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
+

multipath-tools.spec

@@ -1,7 +1,7 @@
 #needsrootforbuild
 Name:    multipath-tools
 Version: 0.8.7
-Release: 10
+Release: 11
 Summary: Tools to manage multipath devices with the device-mapper
 License: GPL-2.0-or-later and LGPL-2.0-only
 URL:     http://christophe.varoqui.free.fr/
@@ -36,6 +36,7 @@ Patch24: 0024-libmultipath-use-directio-checker-for-LIO-targets.patch
 Patch25: 0025-multipathd-make-pr-registration-consistent.patch
 Patch26: 0026-libmultipath-io_err_stat-don-t-free-aio-memory-befor.patch
 Patch27: 0027-libmultipath-io_err_stat-call-io_destroy-inside-free.patch
+Patch28: 0028-multipathd.socket-add-missing-conditions-from-servic.patch
 
 BuildRequires:    multipath-tools, libcmocka, libcmocka-devel
 BuildRequires:    gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89
@@ -183,6 +184,9 @@ fi
 
 
 %changelog
+* Tue Apr 2 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.8.7-11
+- multipathd.socket: add missing conditions from service unit
+
 * Tue Dec 19 2023 wangzhiqiang <wangzhiqiang95@huawei.com> - 0.8.7-10
 - fix coredump in io_err_stat