From: Robert Millan <rmh@aybabtu.com>
Date: Sat, 14 Aug 2010 14:53:25 +0000 (+0200)
Subject: 2010-08-14  Robert Millan  <rmh@gnu.org>
X-Git-Tag: 1.99~663
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3710e088ce80dcc038b6c890191f7646461a101;p=thirdparty%2Fgrub.git

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 3703337d8..b88eae46f 100644
--- 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 760471ebb..29be87720 100644
--- 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, '/');