From 1ff47396e954edbc234c948e4e68ea5c116ff58550320cd6c13dc45a39643cce Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Mon, 25 Apr 2022 09:55:14 +0000
Subject: [PATCH 1/3] - If multipath-tools is newly installed, load
 dm-multipath   (bsc#1196898)

OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=276
---
 multipath-tools.changes | 6 ++++++
 multipath-tools.spec    | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/multipath-tools.changes b/multipath-tools.changes
index 934e951..daad0b8 100644
--- a/multipath-tools.changes
+++ b/multipath-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar 28 12:54:15 UTC 2022 - Martin Wilck <mwilck@suse.com>
+
+- If multipath-tools is newly installed, load dm-multipath
+  (bsc#1196898) 
+
 -------------------------------------------------------------------
 Wed Feb 16 13:24:47 UTC 2022 - Martin Wilck <mwilck@suse.com>
 
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 2f5ca73..742c08f 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package multipath-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -81,6 +81,7 @@ availability of the map devices.
 
 
 
+
 # Currently, it makes no sense to split out libmpathpersist and libmpathcmd
 # separately. libmultipath has no stable API at all, and it depends
 # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath
@@ -193,6 +194,9 @@ install -m 644 -D %{SOURCE3} %{buildroot}/usr/lib/dracut/dracut.conf.d/dm-parts.
 %post
 [ -f /.buildenv ] && exit 0
 %service_add_post multipathd.socket multipathd.service
+if [ $1 -eq 1 ]; then
+    [ ! -x /sbin/modprobe ] || /sbin/modprobe dm_multipath || true
+fi
 %{?regenerate_initrd_post}
 exit 0
 

From 5f3740bb8f7e68f077eff3a4b6aee29b80e5187188c08e3a167939335fb8ce48 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Mon, 25 Apr 2022 09:57:11 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=277

---
 _service | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/_service b/_service
index d965534..7ee2837 100644
--- a/_service
+++ b/_service
@@ -1,17 +1,6 @@
-<?xml version="1.0"?>
 <services>
-  <service name="obs_scm" mode="manual">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
-    <param name="filename">multipath-tools</param>
-    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
-    <param name="revision">factory</param>
-    <param name="match-tag">0.[0-9].[0-9]</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service name="set_version" mode="manual"/>
-  <service mode="buildtime" name="tar"/>
-  <service mode="buildtime" name="recompress">
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>

From 740c39c997719f74dbf80752a46f2e453a288ddbaa4bc6dd995779d4057302f4 Mon Sep 17 00:00:00 2001
From: Martin Wilck <martin.wilck@suse.com>
Date: Mon, 25 Apr 2022 10:08:16 +0000
Subject: [PATCH 3/3] _service: switch back to manual service mode for
 Base:System

OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=278
---
 _service             | 15 +++++++++++++--
 multipath-tools.spec |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/_service b/_service
index 7ee2837..d965534 100644
--- a/_service
+++ b/_service
@@ -1,6 +1,17 @@
+<?xml version="1.0"?>
 <services>
-  <service name="tar" mode="buildtime"/>
-  <service name="recompress" mode="buildtime">
+  <service name="obs_scm" mode="manual">
+    <param name="scm">git</param>
+    <param name="url">https://github.com/openSUSE/multipath-tools.git</param>
+    <param name="filename">multipath-tools</param>
+    <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@+suse.%h</param>
+    <param name="revision">factory</param>
+    <param name="match-tag">0.[0-9].[0-9]</param>
+    <param name="changesgenerate">enable</param>
+  </service>
+  <service name="set_version" mode="manual"/>
+  <service mode="buildtime" name="tar"/>
+  <service mode="buildtime" name="recompress">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 742c08f..effaa17 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -82,6 +82,7 @@ availability of the map devices.
 
 
 
+
 # Currently, it makes no sense to split out libmpathpersist and libmpathcmd
 # separately. libmultipath has no stable API at all, and it depends
 # on libmpathcmd (to be fixed). libmpathpersist depends on libmultipath