Accepting request 804806 from home:hmzhao:branches:openSUSE:Factory

- Add missing patch, which mistakenly removed in lvm2 update
  + bug-998893_make_pvscan_service_after_multipathd.patch
- Change lvm2.spec for fixing build error
  + lvm2.spec

OBS-URL: https://build.opensuse.org/request/show/804806
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=271

bug-998893_make_pvscan_service_after_multipathd.patch

@@ -0,0 +1,23 @@
+From 0da043466ace27eb483114c87ce81feaf00ed682 Mon Sep 17 00:00:00 2001
+From: Eric Ren <zren@suse.com>
+Date: Thu, 6 Apr 2017 11:22:30 +0800
+Subject: [PATCH] systemd service: make pvscan service after multipathd
+
+bsc#998893
+Signed-off-by: Eric Ren <zren@suse.com>
+
+2020-05-13:
+lvm2-lvmetad had been removed, so this patch was modified too.
+Signed-off-by: Heming zhao <heming.zhao@suse.com>
+---
+
+diff -Nupr a/scripts/lvm2-pvscan.service.in b/scripts/lvm2-pvscan.service.in
+--- a/scripts/lvm2-pvscan.service.in    2020-05-13 11:28:58.290210992 +0800
++++ b/scripts/lvm2-pvscan.service.in    2020-05-13 11:29:42.997788967 +0800
+@@ -4,6 +4,7 @@ Documentation=man:pvscan(8)
+ DefaultDependencies=no
+ StartLimitIntervalSec=0
+ BindsTo=dev-block-%i.device
++After=multipathd.service
+ Before=shutdown.target
+ Conflicts=shutdown.target

lvm2.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 13 03:45:38 UTC 2020 - heming.zhao@suse.com
+
+- Add missing patch, which mistakenly removed in lvm2 update
+  + bug-998893_make_pvscan_service_after_multipathd.patch
+- Change lvm2.spec for fixing build error
+  + lvm2.spec
+
 -------------------------------------------------------------------
 Thu Mar 12 09:53:00 UTC 2020 - heming.zhao@suse.com
 

lvm2.spec

@@ -99,6 +99,7 @@ Patch1001:      cmirrord_remove_date_time_from_compilation.patch
 Patch1002:      fate-309425_display-dm-name-for-lv-name.patch
 Patch1003:      fate-31841_fsadm-add-support-for-btrfs.patch
 Patch1004:      bug-935623_dmeventd-fix-dso-name-wrong-compare.patch
+Patch1005:      bug-998893_make_pvscan_service_after_multipathd.patch
 # SUSE patches 2000+ for device mapper, udev rules
 Patch2001:      bug-1012973_simplify-special-case-for-md-in-69-dm-lvm-metadata.patch
 # SUSE patches 3000+ for test code
@@ -188,6 +189,7 @@ Volume Manager.
 %patch1002 -p1
 %patch1003 -p1
 %patch1004 -p1
+%patch1005 -p1
 %patch2001 -p1
 
 %if !%{with lockd}
@@ -305,7 +307,7 @@ rm %{buildroot}%{_unitdir}/dm-event.service
 rm %{buildroot}%{_unitdir}/dm-event.socket
 rm %{buildroot}%{_unitdir}/lvm2-monitor.service
 rm %{buildroot}%{_mandir}/man8/lvm2-activation-generator.8
-rm %{buildroot}%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
+rm %{buildroot}%{_systemdgeneratordir}/lvm2-activation-generator
 rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.service
 rm %{buildroot}%{_unitdir}/lvm2-lvmpolld.socket
 rm %{buildroot}%{_unitdir}/lvm2-pvscan@.service
@@ -730,7 +732,7 @@ LVM commands use lvmlockd to coordinate access to shared storage.
 %{_unitdir}/lvm2-pvscan@.service
 %{_unitdir}/lvm2-lvmpolld.socket
 %{_unitdir}/lvm2-lvmpolld.service
-%{_libexecdir}/systemd/system-generators/lvm2-activation-generator
+%{_systemdgeneratordir}/lvm2-activation-generator
 %dir %{_libdir}/device-mapper
 %{_libdir}/device-mapper/libdevmapper-event-lvm2*.so
 %{_libdir}/libdevmapper-event-lvm2*.so