upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-03-09 09:41:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make ZFSBOOT_BEROOT_NAME be ROOT by default. This is what sysutils/beadm

Browse source 
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 <bryan@shatow.net>
Reviewed by:	Allan Jude <freebsd@allanjude.com>
MFC after:	3 days
This commit is contained in:
Devin Teske 2013-10-15 18:06:33 +00:00
parent 8d36a71b76
commit 67635c19d6
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
usr.sbin/bsdinstall/scripts/zfsboot
View file

@ -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