- lib: Ensure we don't find bind mounts for device target

(099aead590)
- dracut: Disable ostree-prepare-root
 (be56205d06)

SOURCES/dracut-module-setup.sh

@@ -1088,6 +1088,10 @@ install() {
     # Also redirect dracut-emergency to kdump error handler
     ln_r "$systemdsystemunitdir/emergency.service" "$systemdsystemunitdir/dracut-emergency.service"
 
+    # Disable ostree as we only need the physical root
+    systemctl -q --root "$initdir" mask ostree-prepare-root.service
+
+
     # Check for all the devices and if any device is iscsi, bring up iscsi
     # target. Ideally all this should be pushed into dracut iscsi module
     # at some point of time.

SOURCES/kdump-lib-initramfs.sh

@@ -102,7 +102,16 @@ get_fs_type_from_target()
 get_mntpoint_from_target()
 {
 	# --source is applied to ensure non-bind mount is returned
-	get_mount_info TARGET source "$1" -f
+	local SOURCE TARGET
+	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: 8%{?dist}.2
+Release: 8%{?dist}.3.alma.1
 License: GPLv2
 Summary: The kexec/kdump userspace component
 
@@ -408,6 +408,12 @@ fi
 %endif
 
 %changelog
+* Wed Aug 97 2024 Eduard Abdullin <eabdullin@almalinux.org> - 2.0.27-8.3.alma.1
+- lib: Ensure we don't find bind mounts for device target
+ (https://gitlab.com/redhat/centos-stream/rpms/kexec-tools/-/commit/099aead590608cd9edb49acf73873b03b88576b6)
+- dracut: Disable ostree-prepare-root
+ (https://gitlab.com/redhat/centos-stream/rpms/kexec-tools/-/commit/be56205d06d05ce7d1d6313cf5141a34bec597e2)
+
 * Tue May 14 2024 Tao Liu <ltao@redhat.com> - 2.0.27-8.2
 - Install the driver of physical device for a SR-IOV virtual device
 - Try to install PHY and MDIO bus drivers explicitly