* grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Quote bootpath and

	diskdevid.

diff --git a/ChangeLog b/ChangeLog
index 696da12150f9929ded148d832f97f9f774ff4844..b57c6f22902ccf05011c0a433a9dff7ee1a8e838 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Quote bootpath and
+       diskdevid.
+
 2011-01-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Fix compilation on cygwin.

diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
index 5a7b5ec44530fbbc42207dc4c1325b9bafebcd21..224a97792a3bcdac2723926ed8632b674b862ab2 100644 (file)
--- a/grub-core/fs/zfs/zfsinfo.c
+++ b/grub-core/fs/zfs/zfsinfo.c
@@ -364,12 +364,14 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc,
   grub_free (nv);
   grub_free (nvlist);
 
-  bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu%s%s%s%s",
+  bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu%s%s%s%s%s%s",
                           poolname, (unsigned long long) mdnobj,
-                          bootpath ? ",bootpath=" : "",
-                          bootpath ? : "", 
-                          devid ? ",diskdevid=" : "",
-                          devid ? : "");
+                          bootpath ? ",bootpath=\"" : "",
+                          bootpath ? : "",
+                          bootpath ? "\"" : "",
+                          devid ? ",diskdevid=\"" : "",
+                          devid ? : "",
+                          devid ? "\"" : "");
   if (!bootfs)
     return grub_errno;
   if (argc >= 2)