From 3f81fd7097ec931ebf6d862622e6d81834483dbb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 28 Jan 2021 00:37:32 +0000
Subject: sys-boot/os-prober : shamelessly take all the patches from openSUSE
 Factory to make it work

---
 .../files/os-prober-1.49-grub2-mount.patch         | 68 ++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 sys-boot/os-prober/files/os-prober-1.49-grub2-mount.patch

(limited to 'sys-boot/os-prober/files/os-prober-1.49-grub2-mount.patch')

diff --git a/sys-boot/os-prober/files/os-prober-1.49-grub2-mount.patch b/sys-boot/os-prober/files/os-prober-1.49-grub2-mount.patch
new file mode 100644
index 00000000..18c17546
--- /dev/null
+++ b/sys-boot/os-prober/files/os-prober-1.49-grub2-mount.patch
@@ -0,0 +1,68 @@
+Index: os-prober-1.76/common.sh
+===================================================================
+--- os-prober-1.76.orig/common.sh
++++ os-prober-1.76/common.sh
+@@ -279,8 +279,8 @@ linux_mount_boot () {
+ 					debug "found boot partition $1 for linux system on $partition, but cannot map to existing device"
+ 				else
+ 					debug "found boot partition $bootpart for linux system on $partition"
+-					if type grub-mount >/dev/null 2>&1 && \
+-					   grub-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
++					if type grub2-mount >/dev/null 2>&1 && \
++					   grub2-mount "$boottomnt" "$tmpmnt/boot" 2>/dev/null; then
+ 						mounted=1
+ 					fi
+ 				fi
+Index: os-prober-1.76/linux-boot-probes/common/50mounted-tests
+===================================================================
+--- os-prober-1.76.orig/linux-boot-probes/common/50mounted-tests
++++ os-prober-1.76/linux-boot-probes/common/50mounted-tests
+@@ -48,11 +48,11 @@ if [ ! -d "$tmpmnt" ]; then
+ fi
+ 
+ mounted=
+-if type grub-mount >/dev/null 2>&1 && \
+-   type grub-probe >/dev/null 2>&1 && \
+-   grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
++if type grub2-mount >/dev/null 2>&1 && \
++   type grub2-probe >/dev/null 2>&1 && \
++   grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
+ 	mounted=1
+-	type="$(grub-probe -d "$partition" -t fs)"
++	type="$(grub2-probe -d "$partition" -t fs)"
+ 	[ "$type" ] || type=fuseblk
+ fi
+ 
+Index: os-prober-1.76/os-probes/common/50mounted-tests
+===================================================================
+--- os-prober-1.76.orig/os-probes/common/50mounted-tests
++++ os-prober-1.76/os-probes/common/50mounted-tests
+@@ -58,11 +58,11 @@ if [ ! -d "$tmpmnt" ]; then
+ fi
+ 
+ mounted=
+-if type grub-mount >/dev/null 2>&1 && \
+-   type grub-probe >/dev/null 2>&1 && \
+-   grub-mount "$partition" "$tmpmnt" 2>/dev/null; then
++if type grub2-mount >/dev/null 2>&1 && \
++   type grub2-probe >/dev/null 2>&1 && \
++   grub2-mount "$partition" "$tmpmnt" 2>/dev/null; then
+ 	mounted=1
+-	type="$(grub-probe -d "$partition" -t fs)" || true
++	type="$(grub2-probe -d "$partition" -t fs)" || true
+ 	if [ "$type" ]; then
+ 		debug "mounted using GRUB $type filesystem driver"
+ 	else
+Index: os-prober-1.76/os-probes/init/common/10filesystems
+===================================================================
+--- os-prober-1.76.orig/os-probes/init/common/10filesystems
++++ os-prober-1.76/os-probes/init/common/10filesystems
+@@ -3,7 +3,7 @@
+ set +e	# ignore errors from modprobe
+ 
+ FILESYSTEMS='ext2 ext3 ext4 xfs jfs msdos vfat ntfs minix hfs hfsplus qnx4 ufs btrfs'
+-# fuse is needed to make grub-mount work.
++# fuse is needed to make grub2-mount work.
+ FILESYSTEMS="$FILESYSTEMS fuse"
+ # The Ubuntu kernel udebs put a number of filesystem modules in
+ # fs-{core,secondary}-modules. It's fairly cheap to check for these too.
-- 
cgit v1.2.3