From 67635c19d6bbba366a9dcf7663bc36c112f3f3d7 Mon Sep 17 00:00:00 2001 From: Devin Teske Date: Tue, 15 Oct 2013 18:06:33 +0000 Subject: [PATCH] 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 --- usr.sbin/bsdinstall/scripts/zfsboot | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 4d14e22337a2..f43a981e708d 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -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_DATASETS=" # 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_DATASETS=" /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