summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdinstall
diff options
context:
space:
mode:
authorallanjude <allanjude@FreeBSD.org>2014-10-02 17:19:32 +0000
committerallanjude <allanjude@FreeBSD.org>2014-10-02 17:19:32 +0000
commit88af6200b62eec907d364735083085c41268f31c (patch)
treebaf0ec5338645a0f46d71b93e680709465a6a43c /usr.sbin/bsdinstall
parentf0d6c23c18f8099c5faf939bea89160c2326adfe (diff)
downloadFreeBSD-src-88af6200b62eec907d364735083085c41268f31c.zip
FreeBSD-src-88af6200b62eec907d364735083085c41268f31c.tar.gz
MFC r272274:
Change the /var dataset in the default ZFS layout to have the ZFS property canmount=off, making /var/db/pkg part of the / dataset, so installed package files are consistent with the package database when using ZFS boot environments (beadm). PR: 193971 Reviewed by: Shawn Webb, bcr Approved by: re (gjb), jmg Relnotes: yes Sponsored by: ScaleEngine Inc.
Diffstat (limited to 'usr.sbin/bsdinstall')
-rwxr-xr-xusr.sbin/bsdinstall/scripts/zfsboot2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index b7f2c35..08e16f8 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -156,7 +156,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
/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
OpenPOWER on IntegriCloud