2009-12-06 David S. Miller <davem@sunset.davemloft.net>

	* disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Recognize
	anything even prefixed with 'cdrom' as a cdrom.

diff --git a/ChangeLog b/ChangeLog
index 53667833e3be700fb692de329a0c673e95e877a1..479098cda57f519a74a1295d26bff7dfa397bb09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-06  David S. Miller  <davem@sunset.davemloft.net>
+
+       * disk/ieee1275/ofdisk.c (grub_ofdisk_iterate): Recognize
+       anything even prefixed with 'cdrom' as a cdrom.
+
 2009-12-06 Felix Zielcke <fzielcke@z-51.de>
 
        * util/misc.c (make_system_path_relative_to_its_root): Correctly cope with

diff --git a/disk/ieee1275/ofdisk.c b/disk/ieee1275/ofdisk.c
index ca257d6d125fae2c04c29553530331eff48a10e5..a33d729e36da2609d66975c45823ba71bdd08c8d 100644 (file)
--- a/disk/ieee1275/ofdisk.c
+++ b/disk/ieee1275/ofdisk.c
@@ -107,7 +107,7 @@ grub_ofdisk_iterate (int (*hook) (const char *name))
        }
 
       if (! grub_strcmp (alias->type, "block") &&
-         grub_strcmp (alias->name, "cdrom"))
+         grub_strncmp (alias->name, "cdrom", 5))
        ret = hook (alias->name);
       return ret;
     }