os-prober-gentoo-fix.patch

@@ -0,0 +1,13 @@
+Index: os-prober/linux-boot-probes/mounted/common/90fallback
+===================================================================
+--- os-prober.orig/linux-boot-probes/mounted/common/90fallback
++++ os-prober/linux-boot-probes/mounted/common/90fallback
+@@ -33,7 +33,7 @@ for kernpat in /vmlinuz /vmlinux /boot/v
+ 			# Dracut initramfses are named differently again.
+ 			initrdname3=$(echo "$kernfile" | sed "s/vmlinu[zx]/initramfs\*/" | sed 's/$/.img/')
+ 			# And Gentoo's also
+-			initrdname4=$(echo "$kernfile" | sed "s/kernel/initramfs\*/")
++			initrdname4=$(echo "$kernfile" | sed "s/kernel\|vmlinu[zx]/initramfs\*/")
+ 			foundinitrd=0
+ 			for initrd in $(eval ls "$initrdname" "$initrdname1" "$initrdname2" "$initrdname3" "$initrdname4" 2>/dev/null); do
+ 				if [ "$initrd" != "$kernfile" ] && [ -f "$initrd" ] && [ ! -L "$initrd" ]; then

os-prober-grub2-parsefix.patch

@@ -1,7 +1,7 @@
-diff --git a/linux-boot-probes/mounted/common/40grub2 b/linux-boot-probes/mounted/common/40grub2
-index 664505f..5895e45 100755
---- a/linux-boot-probes/mounted/common/40grub2
-+++ b/linux-boot-probes/mounted/common/40grub2
+Index: os-prober-1.58/linux-boot-probes/mounted/common/40grub2
+===================================================================
+--- os-prober-1.58.orig/linux-boot-probes/mounted/common/40grub2
++++ os-prober-1.58/linux-boot-probes/mounted/common/40grub2
 @@ -77,7 +77,7 @@ parse_grub_menu () {
  					ignore_item=1
  				fi
@@ -17,6 +17,6 @@ index 664505f..5895e45 100755
  			;;
 -			initrd)
 +			initrd*)
- 				shift
- 				initrd=""
- 				for initrd_path in "$@"; do
+ 				initrd="$(echo "$2" | sed 's/(.*)//')"
+ 				# Initrd same.
+ 				if [ "$partition" != "$bootpart" ]; then

os-prober.spec

@@ -1,5 +1,5 @@
 Name:           os-prober
-Version:        1.81
+Version:        1.77
 Release:        1
 Summary:        Probe disks on the system for other operating systems
 License:        GPLv2+ and GPL+
@@ -12,9 +12,10 @@ Patch2:         os-prober-mounted-partitions-fix.patch
 Patch3:         os-prober-umount-fix.patch
 Patch4:         os-prober-grub2-parsefix.patch
 Patch5:         os-prober-grepfix.patch
+Patch6:         os-prober-gentoo-fix.patch
 
-BuildRequires:  gcc 
-Requires:       udev coreutils util-linux grep /bin/sed /sbin/modprobe grub2-tools-minimal
+BuildRequires:  gcc git
+Requires:       udev coreutils util-linux grep /bin/sed /sbin/modprobe device-mapper
 
 %description
 Os-prober can probe disks on the system for other operating systems,
@@ -22,12 +23,10 @@ and add them to the boot loader, so that installing current OS doesn't
 make your other installed OS hard to boot.
 
 %prep
-%autosetup -n %{name}-%{version} -p1
+%autosetup -n %{name}-%{version} -Sgit
 find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \;
 sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
      linux-boot-probes/common/50mounted-tests
-sed -i -e 's|grub-mount|grub2-mount|g' os-probes/common/50mounted-tests \
-     linux-boot-probes/common/50mounted-tests common.sh
 
 %build
 %make_build
@@ -83,21 +82,6 @@ fi
 %{_libexecdir}/*
 
 %changelog
-* Sat Jan 28 2023 yixiangzhike <yixiangzhike007@163.com> - 1.81-1
-- update version to 1.81
-
-* Tue Oct 25 2022 yanglongkang <yanglongkang@h-partners.com> - 1.79-2
-- rebuild for next release
-
-* Wed Dec 29 2021 yangzhuangzhuang <yangzhuangzhuang1@huawei.com> - 1.79-1
-- update version to 1.79
-
-* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 1.77-3
-- DESC: delete -Sgit from %autosetup, and delete BuildRequires git
-
-* Wed May 26 2021 yangzhuangzhuang<yangzhuangzhuang1@huawei.com> - 1.77-2
-- Remove code using device mapper
-
 * Thu Jul 23 2020 linwei<linwei54@huawei.com> - 1.77-1
 - update os-prober to 1.77