From 209bf7ac33086e5342ce68d213435eb12bf118e6 Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 21 Sep 2006 17:39:14 +0000 Subject: [PATCH] 2006-09-21 Robert Millan 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. --- ChangeLog | 6 ++++++ util/i386/pc/grub-mkdevicemap.c | 23 +++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2ebe4ae79..881932c1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-09-21 Robert Millan + + 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 * 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 1c4ca86bd..fb23979ac 100644 --- 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 */ + { + 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: