!167 [sync] PR-164: multipathd.socket: add missing conditions from service unit

From: @openeuler-sync-bot 
Reviewed-by: @swf504 
Signed-off-by: @swf504

0044-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

@@ -2,7 +2,7 @@
 
 Name:    multipath-tools
 Version: 0.8.4
-Release: 20
+Release: 21
 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/
@@ -53,6 +53,7 @@ Patch40: 0040-fix-build-failure-caused-by-new-comp.patch
 Patch41: 0041-libmultipath-make-sysfs_is_multipathed-able-to-retur.patch
 Patch42: 0042-multipath-centralize-validation-code.patch
 Patch43: 0043-libmultipath-dm_map_present_by_uuid-fix-dm_task_crea.patch
+Patch44: 0044-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
@@ -200,6 +201,9 @@ fi
 
 
 %changelog
+* Wed May 22 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.8.4-21
+- multipathd.socket: add missing conditions from service unit
+
 * Wed Jan 3 2024 wangzhiqiang <wangzhiqiang95@huawei.com> - 0.8.4-20
 - fix multipath -u not recognize multipath devices