Revision: 1729
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1729
Author: chrfranke
Date: 2008-07-24 19:02:47 +0000 (Thu, 24 Jul 2008)
Log Message:
-----------
2008-07-24 Christian Franke <[EMAIL PROTECTED]>
* 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.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/util/i386/pc/grub-install.in
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2008-07-24 18:14:41 UTC (rev 1728)
+++ trunk/grub2/ChangeLog 2008-07-24 19:02:47 UTC (rev 1729)
@@ -1,3 +1,9 @@
+2008-07-24 Christian Franke <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.ac: Fixed a bug caused by the previous cygwin patch,
Modified: trunk/grub2/util/i386/pc/grub-install.in
===================================================================
--- trunk/grub2/util/i386/pc/grub-install.in 2008-07-24 18:14:41 UTC (rev
1728)
+++ trunk/grub2/util/i386/pc/grub-install.in 2008-07-24 19:02:47 UTC (rev
1729)
@@ -127,8 +127,10 @@
fi
# If the debugging feature is enabled, print commands.
+setup_verbose=
if test $debug = yes; then
set -x
+ setup_verbose="--verbose"
fi
# Initialize these directories here, since ROOTDIR was initialized.
@@ -240,12 +242,12 @@
# The order in this list is critical. Be careful when modifying it.
modules="$modules $fs_module $partmap_module biosdisk $devabstraction_module"
-$grub_mkimage --output=${grubdir}/core.img \
- --prefix=${prefix_drive}`make_system_path_relative_to_its_root
${grubdir}`/ \
- $modules || exit 1
+grub_prefix="${prefix_drive}`make_system_path_relative_to_its_root
${grubdir}`" || exit 1
+$grub_mkimage --output=${grubdir}/core.img --prefix=${grub_prefix}/ $modules
|| exit 1
+
# 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
# Prompt the user to check if the device map is correct.
