From: robertmh <robertmh@localhost>
Date: Wed, 29 Oct 2008 19:14:12 +0000 (+0000)
Subject: 2008-10-29  Robert Millan  <rmh@aybabtu.com>
X-Git-Tag: 1.98~1231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ab28c2157b9d8fbf7145a661c2dae2b4665591e;p=thirdparty%2Fgrub.git

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 2e75ce8d5..02a5bbc04 100644
--- 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 41805c0d1..4b39cbfdd 100644
--- 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} \