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

[David S. Miller]

Revision: 2188
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2188
Author:   davem
Date:     2009-05-04 23:05:12 +0000 (Mon, 04 May 2009)
Log Message:
-----------
        * disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Bypass cdrom
        devices, and do not traverse down under controller nodes.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/disk/ieee1275/ofdisk.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-05-04 22:53:23 UTC (rev 2187)
+++ trunk/grub2/ChangeLog       2009-05-04 23:05:12 UTC (rev 2188)
@@ -5,6 +5,9 @@
 
        * 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.g...@aybabtu.com>
 
        * include/grub/i386/linux.h (GRUB_LINUX_VID_MODE_VESA_START): Set

Modified: trunk/grub2/disk/ieee1275/ofdisk.c
===================================================================
--- trunk/grub2/disk/ieee1275/ofdisk.c  2009-05-04 22:53:23 UTC (rev 2187)
+++ trunk/grub2/disk/ieee1275/ofdisk.c  2009-05-04 23:05:12 UTC (rev 2188)
@@ -106,13 +106,9 @@
            }
        }
 
-      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;
     }