← Back to branch summary

~ubuntu-branches/ubuntu/wily/grub2/wily

« back to all changes in this revision

Viewing changes to grub-core/fs/zfs/zfsinfo.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-01-11 17:11:44 UTC
  • mto: (17.3.26 experimental)
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: james.westby@ubuntu.com-20110111171144-o2h6luxzei5fivmf
Tags: upstream-1.99~20110111
Import upstream version 1.99~20110111

Show diffs side-by-side

added added

removed removed

Lines of Context:
grub-core/fs/zfs/zfsinfo.c
364
364
  grub_free (nv);
365
365
  grub_free (nvlist);
366
366
 
367
 
  if (bootpath && devid)
368
 
    {
369
 
      bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu bootpath=%s diskdevid=%s",
370
 
                               poolname, (unsigned long long) mdnobj,
371
 
                               bootpath, devid);
372
 
      if (!bootfs)
373
 
        return grub_errno;
374
 
    }
375
 
  else
376
 
    {
377
 
      bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu",
378
 
                               poolname, (unsigned long long) mdnobj);
379
 
      if (!bootfs)
380
 
        return grub_errno;
381
 
    }
 
367
  bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu%s%s%s%s",
 
368
                           poolname, (unsigned long long) mdnobj,
 
369
                           bootpath ? ",bootpath=" : "",
 
370
                           bootpath ? : "", 
 
371
                           devid ? ",diskdevid=" : "",
 
372
                           devid ? : "");
 
373
  if (!bootfs)
 
374
    return grub_errno;
382
375
  if (argc >= 2)
383
376
    grub_env_set (args[1], bootfs);
384
377
  else