From owner-svn-src-head@FreeBSD.ORG  Sun Sep 28 21:44:24 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4A9A0CCD;
 Sun, 28 Sep 2014 21:44:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 36C4CC54;
 Sun, 28 Sep 2014 21:44:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8SLiOHb082039;
 Sun, 28 Sep 2014 21:44:24 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8SLiO6C082038;
 Sun, 28 Sep 2014 21:44:24 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201409282144.s8SLiO6C082038@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Sun, 28 Sep 2014 21:44:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r272274 - head/usr.sbin/bsdinstall/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Sep 2014 21:44:24 -0000

Author: allanjude (doc committer)
Date: Sun Sep 28 21:44:23 2014
New Revision: 272274
URL: http://svnweb.freebsd.org/changeset/base/272274

Log:
  Change the /var dataset in the default ZFS layout to have the
  ZFS property canmount=off so that /var/db/pkg and other such directories
  are part of the / dataset, and only /var/mail, /var/log, and /var/crash
  are excluded from the ZFS boot environment (beadm).
  
  PR:		193971
  Approved by:	jmg
  MFC after:	ASAP
  Relnotes:	yes
  Sponsored by:	ScaleEngine Inc.

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Sep 28 21:20:20 2014	(r272273)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Sun Sep 28 21:44:23 2014	(r272274)
@@ -156,7 +156,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA
 	/usr/src
 
 	# Create /var and friends
-	/var		mountpoint=/var
+	/var		mountpoint=/var,canmount=off
 	/var/crash	exec=off,setuid=off
 	/var/log	exec=off,setuid=off
 	/var/mail	atime=on