2004-03-12 Yoshinori K. Okuji <okuji@enbug.org>

	From Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com>:
	* util/grub-install.in (convert): Add support for ATARAID
	device names.
	* lib/device.c (get_ataraid_disk_name) [__linux__]: New
	function.
	(init_device_map) [__linux__]: Probe ATARAID disks.

	* stage2/size_test (check): Don't use the local statement any
	longer. It was unneeded actually. Reported by Paul Jarc.

diff --git a/ChangeLog b/ChangeLog
index c062155f6989f9dde4e7723b73449c870fdc6179..361fc94a31bdc6b288ade9ff22ea9bc98c6ce3a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2004-03-12  Yoshinori K. Okuji  <okuji@enbug.org>
 
+       From Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com>:
+       * util/grub-install.in (convert): Add support for ATARAID
+       device names.
+       * lib/device.c (get_ataraid_disk_name) [__linux__]: New
+       function.
+       (init_device_map) [__linux__]: Probe ATARAID disks.
+
+       * stage2/size_test (check): Don't use the local statement any
+       longer. It was unneeded actually. Reported by Paul Jarc.
+
+2004-03-12  Yoshinori K. Okuji  <okuji@enbug.org>
+       
        From Sergey Matveychuk <sem@ciam.ru>:
        * lib/device.c (get_drive_geometry): Do not open the same device
        more than once unnecessarily.

diff --git a/NEWS b/NEWS
index b1a6b0b3c95ba8b1452a786d5f0ec2bd2eef0c1b..eff7a952c809290984e4d88ca5c9439baafcbacc 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ NEWS - list of user-visible changes between releases of GRUB
 New:
 * Add support for ReiserFS 3.
 * Fix support for FreeBSD 5.
+* Support ATARAID for Linux in the grub shell and grub-install.
 
 New in 0.94 - 2004-01-25:
 * Support building on x86-64 with gcc -m32.

diff --git a/THANKS b/THANKS
index 6838c2bd3d642905df5ad24b8e8a0274ea4f5767..ce6a8adc0ce8faa4dca07c9034aae1a18b748ff5 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -17,6 +17,7 @@ Andrew Walrond <andrew@walrond.org>
 Ben Liblit <liblit@eecs.berkeley.edu>
 Bernhard Treutwein <Bernhard.Treutwein@Verwaltung.Uni-Muenchen.DE>
 Bodo Rueskamp <br@itchigo.com>.
+Boji Tony Kannanthanam <boji.t.kannanthanam@intel.com>
 Bradford Hovinen <hovinen@redrose.net>
 Brian Brunswick <brian@skarpsey.demon.co.uk>
 Bryan Ford <baford@cs.utah.edu>

diff --git a/docs/grub-install.8 b/docs/grub-install.8
index 555b7912ccca4b7a5dd2a2bb60b603aa0e3506f6..a89affe98f8d5a168979674f8c3e335cd361604e 100644 (file)
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "January 2004" "grub-install (GNU GRUB 0.94)" FSF
+.TH GRUB-INSTALL "8" "March 2004" "grub-install (GNU GRUB 0.94)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS

diff --git a/lib/device.c b/lib/device.c
index 7f09d881db028c9aa79392f69176ee5f1528b013..afddee819adbb833478d160fd3fd8917b512938f 100644 (file)
--- a/lib/device.c
+++ b/lib/device.c
@@ -1,7 +1,7 @@
 /* device.c - Some helper functions for OS devices and BIOS drives */
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999,2000,2001,2002,2003  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -361,6 +361,12 @@ get_dac960_disk_name (char *name, int controller, int drive)
 {
   sprintf (name, "/dev/rd/c%dd%d", controller, drive);
 }
+
+static void
+get_ataraid_disk_name (char *name, int unit)
+{
+  sprintf (name, "/dev/ataraid/d%c", unit + '0');
+}
 #endif
 
 /* Check if DEVICE can be read. If an error occurs, return zero,
@@ -682,6 +688,27 @@ init_device_map (char ***map, const char *map_file, int floppy_disks)
        }
     }
   
+#ifdef __linux__
+  /* ATARAID disks.  */
+  for (i = 0; i < 8; i++)
+    {
+      char name[20];
+
+      get_ataraid_disk_name (name, i);
+      if (check_device (name))
+        {
+          (*map)[num_hd + 0x80] = strdup (name);
+          assert ((*map)[num_hd + 0x80]);
+
+          /* If the device map file is opened, write the map.  */
+          if (fp)
+            fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
+
+          num_hd++;
+        }
+    }
+#endif /* __linux__ */
+
   /* The rest is SCSI disks.  */
   for (i = 0; i < 16; i++)
     {

diff --git a/stage2/size_test b/stage2/size_test
index 5cc917ddd26d977da61b0f0354d587ae0c00212c..73269d06e9491cb28f9ead37fc5d2e91ac002a09 100644 (file)
--- a/stage2/size_test
+++ b/stage2/size_test
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Check the sizes of Stage 2 and Stage 1.5's.
-# Copyright (C) 1999  Free Software Foundation, Inc.
+# Copyright (C) 1999,2004  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,8 +25,6 @@
 # status 1, otherwise do nothing.
 check ()
 {
-    local file size limit
-
     file=$1
     limit=$2
     set dummy `ls -l $file`

diff --git a/util/grub-install.in b/util/grub-install.in
index b30c7fde54b23436e22c408274f93659a85174db..4a547f947c28ec0ce198b8f70d0fb341ef4aaaf0 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -92,10 +92,12 @@ convert () {
     case "$host_os" in
     linux*)
        tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
+                                 -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
                                  -e 's%\(fd[0-9]*\)$%\1%' \
                                  -e 's%/part[0-9]*$%/disc%' \
                                  -e 's%\(c[0-7]d[0-9]*\).*$%\1%'`
        tmp_part=`echo "$1" | sed -e 's%.*/[sh]d[a-z]\([0-9]*\)$%\1%' \
+                                 -e 's%.*d[0-9]*p*%%' \
                                  -e 's%.*/fd[0-9]*$%%' \
                                  -e 's%.*/floppy/[0-9]*$%%' \
                                  -e 's%.*/\(disc\|part\([0-9]*\)\)$%\2%' \