Date: Sat, 6 Feb 2016 17:55:39 -0700 From: Warner Losh <imp@bsdimp.com> To: Allan Jude <allanjude@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r295357 - head/sys/boot/zfs Message-ID: <CANCZdfr5QSOQ8Z6PqUpzAArjH9W0TLN=aHgG0JsyjwA2nnbtTA@mail.gmail.com> In-Reply-To: <201602070049.u170nFBo047492@repo.freebsd.org> References: <201602070049.u170nFBo047492@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Feb 6, 2016 at 5:49 PM, Allan Jude <allanjude@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++; > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfr5QSOQ8Z6PqUpzAArjH9W0TLN=aHgG0JsyjwA2nnbtTA>