* grub-core/kern/emu/misc.c

	(grub_make_system_path_relative_to_its_root)
	[HAVE_LIBZFS && HAVE_LIBNVPAIR]: Fix mountpoint return on ZFS.

diff --git a/ChangeLog b/ChangeLog
index bdeb62500cfac81201ca1f4f81aac868fbfb5e07..fe368aa57ebe3ec0c1648301c7f03da3e0ddc419 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2010-10-22  Vladimir Serbinenko  <phcoder@gmail.com>
+2010-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/kern/emu/misc.c
+       (grub_make_system_path_relative_to_its_root)
+       [HAVE_LIBZFS && HAVE_LIBNVPAIR]: Fix mountpoint return on ZFS.
+
+2010-10-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/kern/emu/misc.c
        (grub_make_system_path_relative_to_its_root): Revert r2882.

diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
index d8db3be9def4c01b0473383e1f0b9166709b9d1d..c8b95443b22fd2ed6b3b5b98ba31bf7739d196bf 100644 (file)
--- a/grub-core/kern/emu/misc.c
+++ b/grub-core/kern/emu/misc.c
@@ -416,6 +416,10 @@ grub_make_system_path_relative_to_its_root (const char *path)
            {
              free (buf);
              free (buf2);
+#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+             if (poolfs)
+               return xasprintf ("/%s/@", poolfs);
+#endif
              return xstrdup ("");
            }
          else