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

* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Bypass cdrom

Browse source 
devices, and do not traverse down under controller nodes.
This commit is contained in:
davem 2009-05-04 23:05:12 +00:00
parent 8aadec43ee
commit 9554b15eac
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -5,6 +5,9 @@
* conf/sparc64-ieee1275.rmk: Fix build due to missing '\'. * conf/sparc64-ieee1275.rmk: Fix build due to missing '\'.
* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Bypass cdrom
devices, and do not traverse down under controller nodes.
2009-05-04 Robert Millan <rmh.grub@aybabtu.com> 2009-05-04 Robert Millan <rmh.grub@aybabtu.com>
* include/grub/i386/linux.h (GRUB_LINUX_VID_MODE_VESA_START): Set * include/grub/i386/linux.h (GRUB_LINUX_VID_MODE_VESA_START): Set

8
disk/ieee1275/ofdisk.c
View file

@ -106,13 +106,9 @@ grub_ofdisk_iterate (int (*hook) (const char *name))
} }
} }
if (! grub_strcmp (alias->type, "block")) if (! grub_strcmp (alias->type, "block") &&
grub_strcmp (alias->name, "cdrom"))
ret = hook (alias->name); ret = hook (alias->name);
else if ((! grub_strcmp (alias->type, "scsi"))
|| (! grub_strcmp (alias->type, "ide"))
|| (! grub_strcmp (alias->type, "ata")))
/* Search for block-type children of these bus controllers. */
ret = grub_children_iterate (alias->name, dev_iterate);
return ret; return ret;
} }