mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-21 06:49:35 +00:00
* grub-core/fs/zfs/zfsinfo.c (grub_cmd_zfs_bootfs): Quote bootpath and
diskdevid.
This commit is contained in:
1 parent
f1632d4dd0
commit
4fbf185232
2 files changed
+12
-5
No files matched your search
@@ -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>
|
2011-01-13 Vladimir Serbinenko <phcoder@gmail.com>
|
||||||
|
|
||||||
Fix compilation on cygwin.
|
Fix compilation on cygwin.
|
||||||
|
|||||||
@@ -364,12 +364,14 @@ grub_cmd_zfs_bootfs (grub_command_t cmd __attribute__ ((unused)), int argc,
|
|||||||
grub_free (nv);
|
grub_free (nv);
|
||||||
grub_free (nvlist);
|
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,
|
poolname, (unsigned long long) mdnobj,
|
||||||
bootpath ? ",bootpath=" : "",
|
bootpath ? ",bootpath=\"" : "",
|
||||||
bootpath ? : "",
|
bootpath ? : "",
|
||||||
devid ? ",diskdevid=" : "",
|
bootpath ? "\"" : "",
|
||||||
devid ? : "");
|
devid ? ",diskdevid=\"" : "",
|
||||||
|
devid ? : "",
|
||||||
|
devid ? "\"" : "");
|
||||||
if (!bootfs)
|
if (!bootfs)
|
||||||
return grub_errno;
|
return grub_errno;
|
||||||
if (argc >= 2)
|
if (argc >= 2)
|
||||||
|
|||||||
Reference in new issue
Block a user