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.
This commit is contained in:
parent
9b1392428c
commit
b42b9b7e22
7 changed files with 46 additions and 5 deletions
12
ChangeLog
12
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.
|
||||
|
|
1
NEWS
1
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.
|
||||
|
|
1
THANKS
1
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>
|
||||
|
|
|
@ -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
|
||||
|
|
29
lib/device.c
29
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++)
|
||||
{
|
||||
|
|
|
@ -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`
|
||||
|
|
|
@ -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%' \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue