Accepting request 112069 from devel:openSUSE:Factory

Fix os-prober fails when OSX partition is present (bnc#747919) (forwarded request 112068 from simontol)

OBS-URL: https://build.opensuse.org/request/show/112069
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=32

grub2.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar 29 07:08:38 UTC 2012 - mchang@suse.com
+
+- Add Requires to os-prober as script depends on it for probing
+  foreign os (bnc#753229)
+
 -------------------------------------------------------------------
 Wed Mar 21 06:58:43 UTC 2012 - mchang@suse.com
 

grub2.spec

@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           grub2
 %ifarch x86_64 ppc64
 BuildRequires:  freetype2-devel-32bit
@@ -78,8 +77,10 @@ Patch5:         grub2-unused.patch
 Patch6:         grub2-iterate-and-hook-for-extended-partition.patch
 Patch7:         grub2-install-opt-skip-fs-probe.patch
 Patch8:         grub2-gcc47.patch
+Patch9:         os-prober_osx.patch
 PreReq:         perl-Bootloader
 Requires:       gettext-runtime
+Requires:       os-prober
 Requires(post): /sbin/install-info
 Requires(preun):/sbin/install-info
 
@@ -138,6 +139,7 @@ cd grub-%{version}
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 cd ..
 
 # README.openSUSE

os-prober_osx.patch

@@ -0,0 +1,13 @@
+Index: grub-1.99/util/grub.d/30_os-prober.in
+===================================================================
+--- grub-1.99.orig/util/grub.d/30_os-prober.in	
++++ grub-1.99/util/grub.d/30_os-prober.in	
+@@ -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
+     ;;