Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 7 Feb 2016 00:49:15 +0000 (UTC)
From:      Allan Jude <allanjude@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r295357 - head/sys/boot/zfs
Message-ID:  <201602070049.u170nFBo047492@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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++;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602070049.u170nFBo047492>