svn commit: r295357 - head/sys/boot/zfs

[Warner Losh]

On Sat, Feb 6, 2016 at 5:49 PM, Allan Jude <allanjude at freebsd.org> wrote:

> Author: allanjude
> Date: Sun Feb  7 00:49:15 2016
> New Revision: 295357
> URL: https://svnweb.freebsd.org/changeset/base/295357
>
> Log:
>   Do not set vfs.root.mountfrom unnecessarily
>
>   This causes boot from external media (installer USB image) to mount /
> from
>   the default ZFS BE, rather than the USB device.
>

Sure this didn't just break zfs booting?

Warner


>   Reported by:  kmoore
>   MFC after:    5 days
>   Sponsored by: ScaleEngine Inc.
>
> Modified:
>   head/sys/boot/zfs/zfs.c
>
> Modified: head/sys/boot/zfs/zfs.c
>
> ==============================================================================
> --- head/sys/boot/zfs/zfs.c     Sat Feb  6 22:01:25 2016        (r295356)
> +++ head/sys/boot/zfs/zfs.c     Sun Feb  7 00:49:15 2016        (r295357)
> @@ -722,8 +722,6 @@ init_zfs_bootenv(char *currdev)
>         currdev[strlen(currdev) - 1] = '\0';
>         setenv("zfs_be_active", currdev, 1);
>         setenv("zfs_be_currpage", "1", 1);
> -       /* Do not overwrite if already set */
> -       setenv("vfs.root.mountfrom", currdev, 0);
>         /* Forward past zfs: */
>         currdev = strchr(currdev, ':');
>         currdev++;
>
>