From owner-svn-src-all@freebsd.org  Sun Feb  7 00:49:16 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B693CA9F164;
 Sun,  7 Feb 2016 00:49:16 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8863D1076;
 Sun,  7 Feb 2016 00:49:16 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u170nFis047493;
 Sun, 7 Feb 2016 00:49:15 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u170nFBo047492;
 Sun, 7 Feb 2016 00:49:15 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201602070049.u170nFBo047492@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sun, 7 Feb 2016 00:49:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295357 - head/sys/boot/zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Feb 2016 00:49:16 -0000

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.
  
  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++;