From: Robert Millan <rmh@aybabtu.com>
Date: Sun, 8 Aug 2010 22:11:19 +0000 (+0200)
Subject: 2010-08-08  Robert Millan  <rmh@gnu.org>
X-Git-Tag: 1.99~677
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=346c207240bf1a21ba212601b3a3647e2e4a17d1;p=thirdparty%2Fgrub.git

2010-08-08  Robert Millan  <rmh@gnu.org>

	Fix path generation for sub-filesystems in ZFS.

	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Add
	missing slash.
---

diff --git a/ChangeLog b/ChangeLog
index 4d7361472..3619b00fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-08  Robert Millan  <rmh@gnu.org>
+
+	Fix path generation for sub-filesystems in ZFS.
+
+	* kern/emu/misc.c (grub_make_system_path_relative_to_its_root): Add
+	missing slash.
+
 2010-08-08  Robert Millan  <rmh@gnu.org>
 
 	* util/grub-fstest.c (read_file, cmd_cmp): Improve error message.
diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index b9afa167f..d1a92de30 100644
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -403,7 +403,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
 
   if (poolfs)
     {
-      ret = xasprintf ("/%s@%s", poolfs, buf3);
+      ret = xasprintf ("/%s/@%s", poolfs, buf3);
       free (buf3);
     }
   else