2006-09-21 Robert Millan <rmh@aybabtu.com>

	Import from GRUB Legacy (lib/device.c):
	* util/i386/pc/grub-mkdevicemap.c (get_i2o_disk_name): New function.
	(init_device_map) [__linux__]: Add support for I2O devices.

diff --git a/ChangeLog b/ChangeLog
index 2ebe4ae79b44dbb366273d78ca858343ccb88501..881932c1fc719f1da0718989a9f4eff5756eb9fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-21  Robert Millan  <rmh@aybabtu.com>
+
+       Import from GRUB Legacy (lib/device.c):
+       * util/i386/pc/grub-mkdevicemap.c (get_i2o_disk_name): New function.
+       (init_device_map) [__linux__]: Add support for I2O devices.
+
 2006-09-14  Marco Gerards  <marco@gnu.org>
 
        * conf/i386-pc.rmk (COMMON_LDFLAGS): Use `-m32' instead of

diff --git a/util/i386/pc/grub-mkdevicemap.c b/util/i386/pc/grub-mkdevicemap.c
index 1c4ca86bdab8f97f8bd6468d0fde42e4b0977ea3..fb23979ac31d26d66740ac45495a296219ab825c 100644 (file)
--- a/util/i386/pc/grub-mkdevicemap.c
+++ b/util/i386/pc/grub-mkdevicemap.c
@@ -277,6 +277,12 @@ get_ataraid_disk_name (char *name, int unit)
 {
   sprintf (name, "/dev/ataraid/d%c", unit + '0');
 }
+
+static void
+get_i2o_disk_name (char *name, char unit)
+{
+  sprintf (name, "/dev/i2o/hd%c", unit);
+}
 #endif
 
 /* Check if DEVICE can be read. If an error occurs, return zero,
@@ -482,6 +488,23 @@ make_device_map (const char *device_map, int floppy_disks)
          }
       }
   }
+    
+  /* This is for I2O - we have /dev/i2o/hd<logical drive><partition> */
+  {
+    char unit;
+
+    for (unit = 'a'; unit < 'f'; unit++)
+      {
+       char name[24];
+    
+       get_i2o_disk_name (name, unit);
+       if (check_device (name))
+         {
+           fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
+           num_hd++;
+         }
+      }
+  }
 #endif /* __linux__ */
 
  finish: