From 3e0984aef37be50b2a5820f1f12a83c42f7de78e Mon Sep 17 00:00:00 2001
From: Robert Millan <rmh@gnu.org>
Date: Sat, 12 Nov 2011 01:29:49 +0100
Subject: [PATCH] Fix grub-mkrelpath

---
 debian/patches/no_libzfs.patch | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/debian/patches/no_libzfs.patch b/debian/patches/no_libzfs.patch
index 49d1a09b0..66c2a89a7 100644
--- a/debian/patches/no_libzfs.patch
+++ b/debian/patches/no_libzfs.patch
@@ -258,6 +258,55 @@
  
  /* This function never prints trailing slashes (so that its output
     can be appended a slash unconditionally).  */
+@@ -361,22 +359,18 @@
+   dev_t num;
+   size_t len;
+ 
+-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+   char *poolfs = NULL;
+-#endif
+ 
+   /* canonicalize.  */
+   p = canonicalize_file_name (path);
+   if (p == NULL)
+     grub_util_error ("failed to get canonical path of %s", path);
+ 
+-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+   /* For ZFS sub-pool filesystems, could be extended to others (btrfs?).  */
+   {
+     char *dummy;
+     grub_find_zpool_from_dir (p, &dummy, &poolfs);
+   }
+-#endif
+ 
+   len = strlen (p) + 1;
+   buf = xstrdup (p);
+@@ -428,10 +422,8 @@
+ 	      }
+ #endif
+ 	      free (buf2);
+-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+ 	      if (poolfs)
+ 		return xasprintf ("/%s/@", poolfs);
+-#endif
+ 	      return xstrdup ("");
+ 	    }
+ 	  else
+@@ -488,14 +480,12 @@
+       len--;
+     }
+ 
+-#if defined(HAVE_LIBZFS) && defined(HAVE_LIBNVPAIR)
+   if (poolfs)
+     {
+       ret = xasprintf ("/%s/@%s", poolfs, buf3);
+       free (buf3);
+     }
+   else
+-#endif
+     ret = buf3;
+ 
+   return ret;
 --- a/include/grub/disk.h
 +++ b/include/grub/disk.h
 @@ -42,7 +42,8 @@