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

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

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);
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;
}