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

	* kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
	filesystem is not ZFS.

diff --git a/ChangeLog b/ChangeLog
index 3703337d8aa0e66ae711958bb9d5ff63f33d3a16..b88eae46f5e5b7d5599c197ce35ef0c467933d29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-14  Robert Millan  <rmh@gnu.org>
+
+       * kern/emu/misc.c (grub_find_zpool_from_dir): Abort function if
+       filesystem is not ZFS.
+
 2010-08-12  BVK Chaitanya  <bvk.groups@gmail.com>
 
        Fix for misspelled color names defaulting to black/black (bug

diff --git a/kern/emu/misc.c b/kern/emu/misc.c
index 760471ebbced7bf51190f10d7285aa2eddd02827..29be877200c34a6b2aef5c6887335432a2d336b2 100644 (file)
--- a/kern/emu/misc.c
+++ b/kern/emu/misc.c
@@ -288,6 +288,9 @@ grub_find_zpool_from_dir (const char *dir, char **poolname, char **poolfs)
   if (statfs (dir, &mnt) != 0)
     return;
 
+  if (strcmp (mnt.f_fstypename, "zfs") != 0)
+    return;
+
   *poolname = xstrdup (mnt.f_mntfromname);
 
   slash = strchr (*poolname, '/');