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

2008-07-24 Christian Franke <franke@computer.org>

Browse source 
* util/i386/pc/grub-install.in: If `--debug' is specified,
	pass `--verbose' to grub-setup.
	Abort script if make_system_path_relative_to_its_root() fails.
This commit is contained in:
chrfranke 2008-07-24 19:02:47 +00:00
parent 7810e74787
commit 3a0fa256ac
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-07-24 Christian Franke <franke@computer.org>
* util/i386/pc/grub-install.in: If `--debug' is specified,
pass `--verbose' to grub-setup.
Abort script if make_system_path_relative_to_its_root() fails.
2008-07-24 Bean <bean123ch@gmail.com> 2008-07-24 Bean <bean123ch@gmail.com>
* configure.ac: Fixed a bug caused by the previous cygwin patch, * configure.ac: Fixed a bug caused by the previous cygwin patch,

10
util/i386/pc/grub-install.in
View file

@ -127,8 +127,10 @@ if test "x$install_device" = x; then
fi fi
# If the debugging feature is enabled, print commands. # If the debugging feature is enabled, print commands.
setup_verbose=
if test $debug = yes; then if test $debug = yes; then
set -x set -x
setup_verbose="--verbose"
fi fi
# Initialize these directories here, since ROOTDIR was initialized. # Initialize these directories here, since ROOTDIR was initialized.
@ -240,12 +242,12 @@ fi
# The order in this list is critical. Be careful when modifying it. # The order in this list is critical. Be careful when modifying it.
modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module" modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module"
$grub_mkimage --output=${grubdir}/core.img \ grub_prefix="${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`" || exit 1
--prefix=${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`/ \
$modules || exit 1 $grub_mkimage --output=${grubdir}/core.img --prefix=${grub_prefix}/ $modules || exit 1
# Now perform the installation. # Now perform the installation.
$grub_setup --directory=${grubdir} --device-map=${device_map} \ $grub_setup ${setup_verbose} --directory=${grubdir} --device-map=${device_map} \
${install_device} || exit 1 ${install_device} || exit 1
# Prompt the user to check if the device map is correct. # Prompt the user to check if the device map is correct.