← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/grub-extras/zfs/zfsinfo.c

  • Committer: Bazaar Package Importer
  • Author(s): Felix Zielcke, Robert Millan, Felix Zielcke
  • Date: 2010-01-26 19:26:25 UTC
  • mfrom: (1.13.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100126192625-coq6czap2ofjollf
Tags: 1.98~20100126-1
* New Bazaar snapshot.
  - Includes mipsel-yeeloong port.

[ Robert Millan ]
* config.in: Lower priority of grub2/linux_cmdline_default.

[ Felix Zielcke ]
* Drop `CFLAGS=-O0' workaround on powerpc. Should be fixed correctly now.
* Ship grub-bin2h and grub-script-check in grub-common.
* Terminate NEWS.Debian with a blank line like lintian would suggest
  if that check would be working correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/grub-extras/zfs/zfsinfo.c
368
368
 
369
369
  if (bootpath && devid)
370
370
    {
371
 
      bootfs = grub_malloc
372
 
        (sizeof ("zfs-bootfs=/XXXXXXXXXXXXXXXXXXXXXXXX bootpath= diskdevid=")
373
 
         + grub_strlen (bootpath) + grub_strlen (devid)
374
 
         + grub_strlen (poolname));
 
371
      bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu bootpath=%s diskdevid=%s",
 
372
                               poolname, (unsigned long long) mdnobj,
 
373
                               bootpath, devid);
375
374
      if (!bootfs)
376
375
        return grub_errno;
377
 
      grub_sprintf (bootfs, "zfs-bootfs=%s/%llu bootpath=%s diskdevid=%s",
378
 
                    poolname, (unsigned long long) mdnobj, bootpath, devid);
379
376
    }
380
377
  else
381
378
    {
382
 
      bootfs = grub_malloc
383
 
        (sizeof ("zfs-bootfs=/XXXXXXXXXXXXXXXXXXXXXXXX")
384
 
         + grub_strlen (poolname));
 
379
      bootfs = grub_xasprintf ("zfs-bootfs=%s/%llu",
 
380
                               poolname, (unsigned long long) mdnobj);
385
381
      if (!bootfs)
386
382
        return grub_errno;
387
 
      grub_sprintf (bootfs, "zfs-bootfs=%s/%llu",
388
 
                    poolname, (unsigned long long) mdnobj);
389
383
    }
390
384
  if (argc >= 2)
391
385
    grub_env_set (args[1], bootfs);