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 <[email protected]>
  Reviewed by:  Allan Jude <[email protected]>
  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
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to