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

Look for /boot-rom as well as /rom/boot-rom.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-19 15:14:28 +02:00
parent 386497990a
commit f32555dd93
2 changed files with 7 additions and 1 deletions

View file

@ -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

View file

@ -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",