[PATCH] grub-install: --config-file support...take 2

[Felipe W Damasio]

        Hi GRUB Hackers,

	Even though my previous --config-file support to grub-install did the 
job, it was built against a "generated" grub-install, not against the 
template util/grub-install.in

	This patch, against 0.93 (which is newer then the CVS version, by the 
way), also updates the default grub-install.8 man page to include this 
new option, since that man page is only regenerated when we're in 
maintainer mode.

        According to:

http://mail.gnu.org/archive/html/bug-grub/2003-07/msg00024.html

	Okuji is off (at least for a while)...so who's the current maintainer 
of GNU GRUB?

        Please consider applying.

        Cheers,

Felipe
--
It's most certainly GNU/Linux, not Linux. Read more at
http://www.gnu.org/gnu/why-gnu-linux.html

diff -uNr grub-0.93/docs/grub-install.8 grub-0.93-fwd/docs/grub-install.8
--- grub-0.93/docs/grub-install.8       Sun Dec  8 01:17:59 2002
+++ grub-0.93-fwd/docs/grub-install.8   Tue Jul 22 08:37:06 2003
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "December 2002" "grub-install (GNU GRUB 0.93)" FSF
+.TH GRUB-INSTALL "8" "July 2003" "grub-install (GNU GRUB 0.93)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
@@ -27,6 +27,10 @@
 .TP
 \fB\-\-recheck\fR
 probe a device map even if it already exists
+.TP
+\fB\-\-config\-file\fR=\fIFILE\fR
+use FILE as the stage2 configuration file
+(default=/boot/grub/menu.lst)
 .PP
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
 .SH "REPORTING BUGS"
diff -uNr grub-0.93/util/grub-install.in grub-0.93-fwd/util/grub-install.in
--- grub-0.93/util/grub-install.in      Mon May 20 08:21:50 2002
+++ grub-0.93-fwd/util/grub-install.in  Tue Jul 22 08:36:05 2003
@@ -34,6 +34,7 @@
 img_file=/tmp/grub-install.img.$$
 rootdir=
 grub_prefix=/boot/grub
+config_file=${grub_prefix}/menu.lst
 
 install_device=
 force_lba=
@@ -67,6 +68,8 @@
   --force-lba             force GRUB to use LBA mode even for a buggy
                           BIOS
   --recheck               probe a device map even if it already exists
+  --config-file=FILE      use FILE as the stage2 configuration file 
+                          (default=$config_file)
 
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
 
@@ -225,6 +228,8 @@
        force_lba="--force-lba" ;;
     --recheck)
        recheck=yes ;;
+    --config-file=*)
+        config_file=`echo "$option" | sed 's/--config-file=//'` ;;
     # This is an undocumented feature...
     --debug)
        debug=yes ;;
@@ -293,6 +298,13 @@
     exit 1
 fi
 
+if test -f "$config_file"; then
+    :
+else
+    echo "$config_file: Not found." 1>&2
+    exit 1
+fi
+
 # Don't check for *stage1_5, because it is not fatal even if any
 # Stage 1.5 does not exist.
 
@@ -420,7 +432,7 @@
 test -n "$mklog" && log_file=`$mklog`
 
 # Now perform the installation.
-$grub_shell --batch --device-map=$device_map <<EOF >$log_file
+$grub_shell --config-file=$config_file --batch --device-map=$device_map <<EOF 
>$log_file
 root $root_drive
 setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive
 quit