2010-11-04 Robert Millan <rmh@gnu.org>

	* util/deviceiter.c (grub_util_iterate_devices): Increase SCSI
	limit to 48 (to cope with Sun Fire X4500), and IDE limit to 96
	(its SATA disks are detected as slaveless IDE master drives on
	kFreeBSD).
	Reported by Carsten Aulbert.

diff --git a/ChangeLog b/ChangeLog
index 84305666963e930dd02aa96c274ba042e82b9e19..42100ed78bb6aa19ad7216925e4c7c680bef9c01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-04  Robert Millan  <rmh@gnu.org>
+
+       * util/deviceiter.c (grub_util_iterate_devices): Increase SCSI
+       limit to 48 (to cope with Sun Fire X4500), and IDE limit to 96
+       (its SATA disks are detected as slaveless IDE master drives on
+       kFreeBSD).
+       Reported by Carsten Aulbert.
+
 2010-11-02  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/bin2h.c (main): Fix spelling error in generated output.

diff --git a/util/deviceiter.c b/util/deviceiter.c
index 1cf511934b63ce423c1b610d7291cebd519943e8..34d34b7bbafa245a5b82f11e0cf36ccddfc258b2 100644 (file)
--- a/util/deviceiter.c
+++ b/util/deviceiter.c
@@ -601,7 +601,7 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 #endif /* __linux__ */
 
   /* IDE disks.  */
-  for (i = 0; i < 26; i++)
+  for (i = 0; i < 96; i++)
     {
       char name[16];
 
@@ -655,7 +655,7 @@ grub_util_iterate_devices (int NESTED_FUNC_ATTR (*hook) (const char *, int),
 #endif /* __linux__ */
 
   /* The rest is SCSI disks.  */
-  for (i = 0; i < 26; i++)
+  for (i = 0; i < 48; i++)
     {
       char name[16];