vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
diskdevid.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-13 22:25:56 +01:00
parent f1632d4dd0
commit 4fbf185232
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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.

12
grub-core/fs/zfs/zfsinfo.c
View file

@ -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)