From 6c1e12966368821ba5feec410cb92a027bc13dbb Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 8 Dec 2011 09:59:29 -0800 Subject: [PATCH] fix the hardwired call to grub-probe in 30_os-prober (RH #737203) --- grub-1.99-fix_grub-probe_call.patch | 16 ++++++++++++++++ grub2.spec | 4 ++++ 2 files changed, 20 insertions(+) create mode 100644 grub-1.99-fix_grub-probe_call.patch diff --git a/grub-1.99-fix_grub-probe_call.patch b/grub-1.99-fix_grub-probe_call.patch new file mode 100644 index 00000000..0adf1178 --- /dev/null +++ b/grub-1.99-fix_grub-probe_call.patch @@ -0,0 +1,16 @@ +From: Adam Williamson +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 + ;; diff --git a/grub2.spec b/grub2.spec index 8ca0bdc4..a122da3f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -36,6 +36,7 @@ Patch3: grub-1.99-Workaround-for-variable-set-but-not-used-issue.patch Patch4: grub2-handle-initramfs-on-xen.patch Patch5: grub2-1.99-handle-more-dmraid.patch Patch6: grub2-gfxpayload-efi.patch +Patch7: grub-1.99-fix_grub-probe_call.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -362,6 +363,9 @@ fi %endif %changelog +* Thu Dec 08 2011 Adam Williamson - 1.99-13 +- fix hardwired call to grub-probe in 30_os-prober (rhbz#737203) + * Mon Nov 07 2011 Peter Jones - 1.99-12 - Lots of .spec fixes from Mads Kiilerich: Remove comment about update-grub - it isn't run in any scriptlets