device-mapper-multipath-0.8.7-2

Modify 0013-RH-don-t-start-without-a-config-file.patch
  * add condtion to multipathd.socket as well
This commit is contained in:
Benjamin Marzinski 2021-10-06 22:13:34 -05:00
parent a4b79a10d4
commit be2d12e9d4
2 changed files with 19 additions and 2 deletions

View File

@ -17,7 +17,8 @@ Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
multipath/multipath.rules | 1 + multipath/multipath.rules | 1 +
multipathd/multipathd.8 | 2 ++ multipathd/multipathd.8 | 2 ++
multipathd/multipathd.service | 1 + multipathd/multipathd.service | 1 +
5 files changed, 18 insertions(+) multipathd/multipathd.socket | 1 +
6 files changed, 19 insertions(+)
diff --git a/libmultipath/config.c b/libmultipath/config.c diff --git a/libmultipath/config.c b/libmultipath/config.c
index 30046a17..5f35c3d3 100644 index 30046a17..5f35c3d3 100644
@ -92,3 +93,15 @@ index 0b2ac814..6d57c7e8 100644
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
ConditionKernelCommandLine=!nompath ConditionKernelCommandLine=!nompath
diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket
index c777e5e3..3c20a2ff 100644
--- a/multipathd/multipathd.socket
+++ b/multipathd/multipathd.socket
@@ -1,6 +1,7 @@
[Unit]
Description=multipathd control socket
DefaultDependencies=no
+ConditionPathExists=/etc/multipath.conf
ConditionKernelCommandLine=!nompath
ConditionKernelCommandLine=!multipath=off
ConditionVirtualization=!container

View File

@ -1,6 +1,6 @@
Name: device-mapper-multipath Name: device-mapper-multipath
Version: 0.8.7 Version: 0.8.7
Release: 1%{?dist} Release: 2%{?dist}
Summary: Tools to manage multipath devices using device-mapper Summary: Tools to manage multipath devices using device-mapper
License: GPLv2 License: GPLv2
URL: http://christophe.varoqui.free.fr/ URL: http://christophe.varoqui.free.fr/
@ -227,6 +227,10 @@ fi
%{_pkgconfdir}/libdmmp.pc %{_pkgconfdir}/libdmmp.pc
%changelog %changelog
* Wed Oct 6 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-2
- Modify 0013-RH-don-t-start-without-a-config-file.patch
* add condtion to multipathd.socket as well
* Wed Oct 6 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-1 * Wed Oct 6 2021 Benjamin Marzinski <bmarzins@redhat.com> - 0.8.7-1
- Update source to upstream version 0.8.7 - Update source to upstream version 0.8.7
* Previous patches 0001-0023 are included in the commit. * Previous patches 0001-0023 are included in the commit.