From owner-svn-src-all@FreeBSD.ORG Tue Oct 15 18:06:33 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id D051B840; Tue, 15 Oct 2013 18:06:33 +0000 (UTC) (envelope-from dteske@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A35EF2C46; Tue, 15 Oct 2013 18:06:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9FI6XcT099734; Tue, 15 Oct 2013 18:06:33 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9FI6XXe099733; Tue, 15 Oct 2013 18:06:33 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201310151806.r9FI6XXe099733@svn.freebsd.org> From: Devin Teske Date: Tue, 15 Oct 2013 18:06:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r256553 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Oct 2013 18:06:33 -0000 Author: dteske Date: Tue Oct 15 18:06:33 2013 New Revision: 256553 URL: http://svnweb.freebsd.org/changeset/base/256553 Log: Make ZFSBOOT_BEROOT_NAME be ROOT by default. This is what sysutils/beadm and OpenSolaris/Illumos beadm use. Remove /usr/local and /var/db/pkg datasets. Andriy Gapon writes: I want to note that a good implementation of BEs should support a dependent datasets feature. Unfortunately, it seems that we do not have any good BE implementation for FreeBSD right now. If we had, personally I'd prefer to have /usr/local in separate filesystem. NOTE: Until then, remove these datasets. Discussed on: src-committers Submitted by: Bryan Drewery Reviewed by: Allan Jude MFC after: 3 days Modified: head/usr.sbin/bsdinstall/scripts/zfsboot Modified: head/usr.sbin/bsdinstall/scripts/zfsboot ============================================================================== --- head/usr.sbin/bsdinstall/scripts/zfsboot Tue Oct 15 17:59:41 2013 (r256552) +++ head/usr.sbin/bsdinstall/scripts/zfsboot Tue Oct 15 18:06:33 2013 (r256553) @@ -47,7 +47,7 @@ f_include $BSDCFG_SHARE/variable.subr # # Default name for the boot environment parent dataset # -: ${ZFSBOOT_BEROOT_NAME:=bootenv} +: ${ZFSBOOT_BEROOT_NAME:=ROOT} # # Default name for the primany boot environment @@ -119,8 +119,6 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA # Don't mount /usr so that 'base' files go to the BEROOT /usr mountpoint=/usr,canmount=off - /usr/local # local files (i.e. from packages) separate from base system - # Home directories separated so they are common to all BEs /usr/home setuid=off @@ -137,7 +135,6 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA /var mountpoint=/var /var/crash compression=lz4,exec=off,setuid=off /var/db exec=off,setuid=off - /var/db/pkg compression=lz4,exec=off,setuid=off /var/empty exec=off,setuid=off /var/log compression=lz4,exec=off,setuid=off /var/mail compression=lz4,exec=off,setuid=off