vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix a bug in grub-install.

Browse source
This commit is contained in:
okuji 2000-10-08 03:42:36 +00:00
parent 261bf12dcf
commit aa7121490f
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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> 2000-10-08 OKUJI Yoshinori <okuji@gnu.org>
* stage2/builtins.c (find_func): Clear ERRNUM after the last * stage2/builtins.c (find_func): Clear ERRNUM after the last

5
util/grub-install.in
View file

@ -32,6 +32,7 @@ pkgdatadir=${datadir}/${PACKAGE}/${host_cpu}-${host_vendor}
grub_shell=${sbindir}/grub grub_shell=${sbindir}/grub
log_file=/tmp/grub-install.log.$$ log_file=/tmp/grub-install.log.$$
rootdir= rootdir=
grub_prefix=/boot/grub
install_device= install_device=
force_lba= force_lba=
@ -240,7 +241,7 @@ bootdir_device=`df ${bootdir} | grep /dev/ \
if test "x$root_device" != "x$bootdir_device"; then if test "x$root_device" != "x$bootdir_device"; then
# Perhaps the user has a separate boot partition. # Perhaps the user has a separate boot partition.
root_device=$bootdir_device root_device=$bootdir_device
grubdir="/grub" grub_prefix="/grub"
fi fi
# Convert the root device to a GRUB drive. # 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. # Now perform the installation.
$grub_shell --batch --device-map=$device_map <<EOF >$log_file $grub_shell --batch --device-map=$device_map <<EOF >$log_file
root $root_drive 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 quit
EOF EOF