fix a bug in grub-install.

diff --git a/ChangeLog b/ChangeLog
index c5a048485dde4ddfb5af67c5d770390b48b8a60c..d4bd9ac278906798a956f42bde933c923d876433 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-08  OKUJI Yoshinori  <okuji@gnu.org>
+
+       * util/grub-install.in (grub_prefix): New variable. The default
+       is "/boot/grub".
+       If the user has a separate boot partition, set grub_prefix
+       instead of grubdir to "/grub".
+       When running the command "setup", specify $grub_prefix instead
+       of $grubdir to the option "--prefix".
+       Report by Thierry Laronde.
+       
 2000-10-08  OKUJI Yoshinori  <okuji@gnu.org>
 
        * stage2/builtins.c (find_func): Clear ERRNUM after the last

diff --git a/util/grub-install.in b/util/grub-install.in
index 8ed097a7a0db71425b2564e7337dc652f32b4171..6c3c2c487abc98ec562327f2976b338a83cdbf4d 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -32,6 +32,7 @@ pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor}
 grub_shell=${sbindir}/grub
 log_file=/tmp/grub-install.log.$$
 rootdir=
+grub_prefix=/boot/grub
 
 install_device=
 force_lba=
@@ -240,7 +241,7 @@ bootdir_device=`df ${bootdir} | grep /dev/ \
 if test "x$root_device" != "x$bootdir_device"; then
     # Perhaps the user has a separate boot partition.
     root_device=$bootdir_device
-    grubdir="/grub"
+    grub_prefix="/grub"
 fi
 
 # Convert the root device to a GRUB drive.
@@ -277,7 +278,7 @@ test -x /bin/tempfile && log_file=`tempfile --prefix=grub`
 # Now perform the installation.
 $grub_shell --batch --device-map=$device_map <<EOF >$log_file
 root $root_drive
-setup $force_lba --stage2=$grubdir/stage2 --prefix=$grubdir $install_drive
+setup $force_lba --stage2=$grubdir/stage2 --prefix=$grub_prefix $install_drive
 quit
 EOF