2008-10-29 Robert Millan <rmh@aybabtu.com>

        * util/i386/pc/grub-install.in: Handle empty string as output from
        make_system_path_relative_to_its_root().

diff --git a/ChangeLog b/ChangeLog
index 2e75ce8d516e0bd10bd5539df1af6e2c5f5efcdd..02a5bbc04b8b16beb0505ef5f79af1a336562312 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-29  Robert Millan  <rmh@aybabtu.com>
+
+       * util/i386/pc/grub-install.in: Handle empty string as output from
+       make_system_path_relative_to_its_root().
+
 2008-10-05  Hans Lambermont  <hans@lambermont.dyndns.org>
 
        * disk/lvm.c (grub_lvm_scan_device): Allocate buffer space for the

diff --git a/util/i386/pc/grub-install.in b/util/i386/pc/grub-install.in
index 41805c0d126e4777a876ba9d57e1bc82ce47ee50..4b39cbfdd61f344dcda1ff8f0f20425a4cf1ced1 100644 (file)
--- a/util/i386/pc/grub-install.in
+++ b/util/i386/pc/grub-install.in
@@ -261,9 +261,12 @@ else
     prefix_drive=`$grub_probe --target=drive --device ${grub_device}`
 fi
 
-grub_prefix="${prefix_drive}`make_system_path_relative_to_its_root ${grubdir}`" || exit 1
+relative_grubdir=`make_system_path_relative_to_its_root ${grubdir}` || exit 1
+if [ "x${relative_grubdir}" = "x" ] ; then
+    relative_grubdir=/
+fi
 
-$grub_mkimage --output=${grubdir}/core.img --prefix=${grub_prefix} $modules || exit 1
+$grub_mkimage --output=${grubdir}/core.img --prefix=${prefix_drive}${relative_grubdir} $modules || exit 1
 
 # Now perform the installation.
 $grub_setup ${setup_verbose} --directory=${grubdir} --device-map=${device_map} \