rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 15:46:53 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

fix the hardwired call to grub-probe in 30_os-prober (RH #737203)

Browse source
This commit is contained in:
Adam Williamson 2011-12-08 09:59:29 -08:00
parent 212d822ae8
commit 6c1e129663
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
grub-1.99-fix_grub-probe_call.patch Normal file
View file

@ -0,0 +1,16 @@
From: Adam Williamson <awilliam@redhat.com>
Subject: call ${grub_probe} instead of grub-probe in OSXUUID line of 30_os-prober.in
Date: 2011-12-08 17:55:47 +0000
=== modified file 'util/grub.d/30_os-prober.in'
--- a/util/grub.d/30_os-prober.in 2011-12-08 09:39:52.311466000 -0800
+++ b/util/grub.d/30_os-prober.in 2011-12-08 09:41:22.984908889 -0800
@@ -168,7 +168,7 @@
done
;;
macosx)
- OSXUUID="`grub-probe --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
+ OSXUUID="`${grub_probe} --target=fs_uuid --device ${DEVICE} 2> /dev/null`"
osx_entry xnu_kernel 32
osx_entry xnu_kernel64 64
;;

4
grub2.spec
View file

@ -36,6 +36,7 @@ Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch
Patch4: grub2-handle-initramfs-on-xen.patch Patch4: grub2-handle-initramfs-on-xen.patch
Patch5: grub2-1.99-handle-more-dmraid.patch Patch5: grub2-1.99-handle-more-dmraid.patch
Patch6: grub2-gfxpayload-efi.patch Patch6: grub2-gfxpayload-efi.patch
Patch7: grub-1.99-fix_grub-probe_call.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -362,6 +363,9 @@ fi
%endif %endif
%changelog %changelog
* Thu Dec 08 2011 Adam Williamson <awilliam@redhat.com> - 1.99-13
- fix hardwired call to grub-probe in 30_os-prober (rhbz#737203)
* Mon Nov 07 2011 Peter Jones <pjones@redhat.com> - 1.99-12 * Mon Nov 07 2011 Peter Jones <pjones@redhat.com> - 1.99-12
- Lots of .spec fixes from Mads Kiilerich: - Lots of .spec fixes from Mads Kiilerich:
Remove comment about update-grub - it isn't run in any scriptlets Remove comment about update-grub - it isn't run in any scriptlets