* util/getroot.c (grub_find_root_devices_from_mountinfo): Handle

	"zfs" and "fuse.zfs" as synonyms.

diff --git a/ChangeLog b/ChangeLog
index de168a73a779edd4bd4a86190854031e797c4ed5..9c413e471a55ff0c6822430a3187016cc35f6d1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Richard Laager <rlaager@wiktel.com>
+
+       * util/getroot.c (grub_find_root_devices_from_mountinfo): Handle
+       "zfs" and "fuse.zfs" as synonyms.
+
 2012-02-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * configure.ac: Put platform and target_cpu substitutions back since

diff --git a/util/getroot.c b/util/getroot.c
index 2c101b8ba2de35d0afbce92ed2d31ca00a445c83..e87f42963221db4bd808bc229b995cd1ce835dc1 100644 (file)
--- a/util/getroot.c
+++ b/util/getroot.c
@@ -601,7 +601,8 @@ grub_find_root_devices_from_mountinfo (const char *dir, char **relroot)
       if (!*entries[i].device)
        continue;
 
-      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0)
+      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0
+         || grub_strcmp (entries[i].fstype, "zfs") == 0)
        {
          char *slash;
          slash = strchr (entries[i].device, '/');