From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 19 Apr 2013 13:14:28 +0000 (+0200)
Subject: 	* grub-core/kern/ieee1275/cmain.c (grub_ieee1275_find_options):
X-Git-Tag: grub-2.02-beta1~1135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32555dd93ebd109764114cea76003eb83337c1d;p=thirdparty%2Fgrub.git

	* 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 3d4b23d92..488be607b 100644
--- 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 5f6a6da3a..abd1ca96c 100644
--- 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",