Re: Freeze on 27 February

[Richard Laager]

On Thu, 2012-02-23 at 07:34 +0100, Vladimir 'φ-coder/phcoder' Serbinenko
wrote:
> > Index: grub/util/getroot.c
> > ===================================================================
> > --- grub.orig/util/getroot.c        2012-02-03 05:22:36.227364000 -0600
> > +++ grub/util/getroot.c     2012-02-03 05:22:41.255135000 -0600
> > @@ -301,7 +301,10 @@
> >                 devices = xrealloc (devices, sizeof (devices[0])
> >                                     * devices_allocated);
> >               }
> > -           devices[ndevices++] = xasprintf ("/dev/%s", name);
> > +           if (name[0] == '/')
> > +             devices[ndevices++] = xstrdup (name);
> > +           else
> > +             devices[ndevices++] = xasprintf ("/dev/%s", name);
> >           }
> >         break;
> >       }
> >
> This one is ok other than the missing ChangeLog.

Updated zfs-devices.patch attached

> @@ -478,7 +558,8 @@
>         if (!*entries[i].device)
>       continue;
> 
> -      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0)
> +      if (grub_strcmp (entries[i].fstype, "fuse.zfs") == 0 ||
> +          grub_strcmp (entries[i].fstype, "zfs") == 0)
>       {
>         char *slash;
>         slash = strchr (entries[i].device, '/');
> This should go as a separate patch

Attached as zfs-fstype.patch.

-- 
Richard

zfs-devices.patch
Description: Text Data

zfs-fstype.patch
Description: Text Data

signature.asc
Description: This is a digitally signed message part