SOURCES/kdump-lib-initramfs.sh

@@ -101,8 +101,15 @@ get_fs_type_from_target()
 
 get_mntpoint_from_target()
 {
-	# --source is applied to ensure non-bind mount is returned
+	local SOURCE TARGET
-	get_mount_info TARGET source "$1" -f
+	findmnt -k --pairs -o SOURCE,TARGET "$1" | while read line; do
+		eval "$line"
+		# omit sources that are bind mounts i.e. they contain a [/path/to/subpath].
+		if [[ ! "$SOURCE" =~ \[ ]]; then
+			echo $TARGET
+			break
+		fi
+	done
 }
 
 is_ssh_dump_target()

SOURCES/kdump-lib.sh

@@ -213,7 +213,7 @@ get_bind_mount_source()
 
 	_fsroot=${_src#${_src_nofsroot}[}
 	_fsroot=${_fsroot%]}
-	_mnt=$(get_mount_info TARGET source "$_src_nofsroot" -f)
+	_mnt=$(get_mntpoint_from_target "$_src_nofsroot")
 
 	# for btrfs, _fsroot will also contain the subvol value as well, strip it
 	if [[ $_fstype == btrfs ]]; then

SPECS/kexec-tools.spec

@@ -5,7 +5,7 @@
 
 Name: kexec-tools
 Version: 2.0.27
-Release: 16%{?dist}.1
+Release: 15%{?dist}
 License: GPLv2
 Summary: The kexec/kdump userspace component
 
@@ -410,12 +410,6 @@ fi
 %endif
 
 %changelog
-* Wed Sep 18 2024 Tao Liu <ltao@redhat.com> - 2.0.27-16.1
-- Rebuild with updated release
-
-* Tue Sep 10 2024 Tao Liu <ltao@redhat.com> - 2.0.27-16
-- Revert "lib: Ensure we don't find bind mounts for device target"
-
 * Wed Aug 7 2024 Tao Liu <ltao@redhat.com> - 2.0.27-15
 - Support setting up Open vSwitch (Ovs) Bridge network
 
@@ -512,6 +506,9 @@ fi
 - Show how much time kdump has waited for the network to be ready
 - Tell nmcli to not escape colon when getting the path of connection profile
 
+* Fri Apr 14 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 2.0.26-1
+- Rebuilt for MSVSphere 9.2 beta
+
 * Fri Apr 7 2023 Tao Liu <ltao@redhat.com> - 2.0.26-1
 - Rebase kexec-tools to v2.0.26