vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if

Browse source 
returned by firmware.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-03-31 22:01:37 +02:00
parent af09641e2b
commit f9fd65df54
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-03-31 Vladimir Serbinenko <phcoder@gmail.com>
* kern/ieee1275/openfw.c (grub_children_iterate): Skip device itself if
returned by firmware.
2010-03-30 Vladimir Serbinenko <phcoder@gmail.com> 2010-03-30 Vladimir Serbinenko <phcoder@gmail.com>
* loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix * loader/i386/multiboot_mbi2.c (retrieve_video_parameters): Fix

6
kern/ieee1275/openfw.c
View file

@ -73,10 +73,16 @@ grub_children_iterate (char *devpath,
IEEE1275_MAX_PROP_LEN, &actual)) IEEE1275_MAX_PROP_LEN, &actual))
childtype[0] = 0; childtype[0] = 0;
if (dev == child)
continue;
if (grub_ieee1275_package_to_path (child, childpath, if (grub_ieee1275_package_to_path (child, childpath,
IEEE1275_MAX_PATH_LEN, &actual)) IEEE1275_MAX_PATH_LEN, &actual))
continue; continue;
if (grub_strcmp (devpath, childpath) == 0)
continue;
if (grub_ieee1275_get_property (child, "name", childname, if (grub_ieee1275_get_property (child, "name", childname,
IEEE1275_MAX_PROP_LEN, &actual)) IEEE1275_MAX_PROP_LEN, &actual))
continue; continue;