* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):

	Look for /boot-rom as well as /rom/boot-rom.

diff --git a/ChangeLog b/ChangeLog
index 3d4b23d92bc0a32cd028c5451edb0ad450de90a9..488be607bbdeb795d89698e573d8eb02b976a205 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):
+       Look for /boot-rom as well as /rom/boot-rom.
+
 2013-04-19  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/videotest.c (grub_cmd_videotest): Fix error

diff --git a/grub-core/kern/ieee1275/cmain.c b/grub-core/kern/ieee1275/cmain.c
index 5f6a6da3a811b2a82fa0a38ce37689860c602671..abd1ca96c017628437a808cb97c764ea3e9bd425 100644 (file)
--- a/grub-core/kern/ieee1275/cmain.c
+++ b/grub-core/kern/ieee1275/cmain.c
@@ -186,7 +186,8 @@ grub_ieee1275_find_options (void)
       grub_ieee1275_set_flag (GRUB_IEEE1275_FLAG_HAS_CURSORONOFF);
     }
 
-  if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom))
+  if (! grub_ieee1275_finddevice ("/rom/boot-rom", &bootrom)
+      || ! grub_ieee1275_finddevice ("/boot-rom", &bootrom))
     {
       rc = grub_ieee1275_get_property (bootrom, "model", tmp, sizeof (tmp), 0);
       if (rc >= 0 && !grub_strncmp (tmp, "PPC Open Hack'Ware",