rpms/os-prober
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add Fedora's grub2 config path, fixes generating menu entries for other

Browse Source 
installed Fedora's
This commit is contained in:
Hedayat Vatankhah 2012-05-25 13:08:25 +04:30
parent fc4bf8bb9d
commit f8e8dfcdbd
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os-prober-grub2-fedorafix.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up os-prober-1.53/linux-boot-probes/mounted/common/40grub2.fedorafix os-prober-1.53/linux-boot-probes/mounted/common/40grub2
--- os-prober-1.53/linux-boot-probes/mounted/common/40grub2.fedorafix 2012-05-25 12:52:25.067271268 +0430
+++ os-prober-1.53/linux-boot-probes/mounted/common/40grub2 2012-05-25 12:53:41.552315071 +0430
@@ -94,6 +94,9 @@ if [ -e "$mpoint/boot/grub/grub.cfg" ] &
[ "$mpoint/boot/grub/grub.cfg" -nt "$mpoint/boot/grub/menu.lst" ]); then
debug "parsing grub.cfg"
parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub/grub.cfg"
+elif [ -e "$mpoint/boot/grub2/grub.cfg" ]; then
+ debug "parsing grub.cfg"
+ parse_grub_menu "$mpoint" "$partition" "$bootpart" < "$mpoint/boot/grub2/grub.cfg"
fi
if [ "$found_item" = 0 ]; then

8
os-prober.spec
View File

@ -1,6 +1,6 @@
Name: os-prober Name: os-prober
Version: 1.53 Version: 1.53
Release: 1%{?dist} Release: 2%{?dist}
Summary: Probes disks on the system for installed operating systems Summary: Probes disks on the system for installed operating systems
Group: System Environment/Base Group: System Environment/Base
@ -12,6 +12,7 @@ Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{
# can be automatically generated for it # can be automatically generated for it
Patch0: os-prober-newnsdirfix.patch Patch0: os-prober-newnsdirfix.patch
Patch1: os-porber-no-dummy-mach-kernel.patch Patch1: os-porber-no-dummy-mach-kernel.patch
Patch2: os-prober-grub2-fedorafix.patch
Requires: udev coreutils util-linux Requires: udev coreutils util-linux
Requires: grep /bin/sed /sbin/modprobe Requires: grep /bin/sed /sbin/modprobe
@ -25,6 +26,7 @@ distributions can be added easily.
%setup -q %setup -q
%patch0 -p1 -b .newnsdirfix %patch0 -p1 -b .newnsdirfix
%patch1 -p1 -b .macosxdummyfix %patch1 -p1 -b .macosxdummyfix
%patch2 -p1 -b .grub2-fedorafix
find -type f -exec sed -i -e 's|usr/lib|usr/libexec|g' {} \; 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 \ sed -i -e 's|grub-probe|grub2-probe|g' os-probes/common/50mounted-tests \
linux-boot-probes/common/50mounted-tests linux-boot-probes/common/50mounted-tests
@ -74,6 +76,10 @@ fi
%{_var}/lib/%{name} %{_var}/lib/%{name}
%changelog %changelog
* Fri May 25 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-2
- Add Fedora's grub2 config path, fixes generating menu entries for other
installed Fedora's
* Fri May 11 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-1 * Fri May 11 2012 Hedayat Vatankhah <hedayat.fwd+rpmchlog@gmail.com> - 1.53-1
- Updated to 1.53 for a bugfix - Updated to 1.53 for a bugfix
- Fixed directory name in upstream tarbal - Fixed directory name in upstream tarbal