From fbdfb470caf8131be9bcd96a2432b3b2c59a3916e79e32fb3365efbc4f3b5418 Mon Sep 17 00:00:00 2001
From: heming zhao <heming.zhao@suse.com>
Date: Sun, 20 Aug 2023 09:20:35 +0000
Subject: [PATCH] Accepting request 1104868 from
 home:hmzhao:branches:Base:System

- blkdeactivate calls wrong mountpoint cmd (bsc#1214071)
  + bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch

OBS-URL: https://build.opensuse.org/request/show/1104868
OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=330
---
 ...blkdeactivate_calls_wrong_mountpoint.patch | 20 +++++++++++++++++++
 lvm2.changes                                  |  6 ++++++
 lvm2.spec                                     |  2 ++
 3 files changed, 28 insertions(+)
 create mode 100644 bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch

diff --git a/bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch b/bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch
new file mode 100644
index 0000000..794026d
--- /dev/null
+++ b/bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch
@@ -0,0 +1,20 @@
+From: Heming Zhao <heming.zhao@suse.com>
+Date: Sun, 20 Aug 2023 11:41:00 +0800
+
+This patch is for 'bsc#1214071 - blkdeactivate calls wrong mountpoint cmd'.
+Current 12sp5, 15sp2, 15sp3, 15sp4 & 15sp5 need to fix.
+
+Signed-off-by: Heming Zhao <heming.zhao@suse.com>
+
+diff -Nupr a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
+--- a/scripts/blkdeactivate.sh.in	2023-08-20 10:23:36.744082346 +0800
++++ b/scripts/blkdeactivate.sh.in	2023-08-20 10:23:59.544161133 +0800
+@@ -35,7 +35,7 @@ DEV_DIR="/dev"
+ SYS_BLK_DIR="/sys/block"
+ 
+ MDADM="/sbin/mdadm"
+-MOUNTPOINT="/bin/mountpoint"
++MOUNTPOINT="/usr/bin/mountpoint"
+ MPATHD="/sbin/multipathd"
+ UMOUNT="/bin/umount"
+ VDO="/bin/vdo"
diff --git a/lvm2.changes b/lvm2.changes
index 8e5f523..ae9df49 100644
--- a/lvm2.changes
+++ b/lvm2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Aug 20 03:48:00 UTC 2023 - heming.zhao@suse.com
+
+- blkdeactivate calls wrong mountpoint cmd (bsc#1214071)
+  + bug-1214071-blkdeactivate_calls_wrong_mountpoint.patch
+
 -------------------------------------------------------------------
 Fri Jun 23 06:38:00 UTC 2023 - Heming Zhao <heming.zhao@suse.com>
 
diff --git a/lvm2.spec b/lvm2.spec
index 7aee8f0..acd899e 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -97,6 +97,7 @@ Patch1005:      bug-1184687_Add-nolvm-for-kernel-cmdline.patch
 Patch1006:      fate-31841-01_fsadm-add-support-to-resize-check-btrfs-filesystem.patch
 Patch1007:      fate-31841-02_man-add-support-for-btrfs.patch
 Patch1008:      fate-31841-03_tests-new-test-suite-of-fsadm-for-btrfs.patch
+Patch1009:      bug-1214071-blkdeactivate_calls_wrong_mountpoint.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
@@ -169,6 +170,7 @@ Volume Manager.
 %patch1006 -p1
 %patch1007 -p1
 %patch1008 -p1
+%patch1009 -p1
 %patch2001 -p1
 %patch3001 -p1