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 4d7361472aa76785f5cd7382c7b4b2d2e1bf8831..3619b00facf17096eb80bc7a5d984b6782371bfc 100644 (file)
--- 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 b9afa167fccabe22fda23cd46913b3503d492aa5..d1a92de30715d7c5f9881466905d4c98b46949df 100644 (file)
--- 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