summaryrefslogtreecommitdiffstats
path: root/usr.sbin/bsdinstall
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-01-19 16:18:02 -0200
committerRenato Botelho <renato@netgate.com>2017-01-19 16:18:18 -0200
commit1b0f4cedd2059c869b9500054a18aa6377bd8fe4 (patch)
treee8c10c21c445da91b97f043bed5de34202c3ac6d /usr.sbin/bsdinstall
parent7a320d50b99856913ca535c3ff208e50c47c8d5c (diff)
downloadFreeBSD-src-1b0f4cedd2059c869b9500054a18aa6377bd8fe4.zip
FreeBSD-src-1b0f4cedd2059c869b9500054a18aa6377bd8fe4.tar.gz
Remove unnecessary partitions when using ZFS, ticket #7086
Diffstat (limited to 'usr.sbin/bsdinstall')
-rwxr-xr-xusr.sbin/bsdinstall/scripts/zfsboot21
1 files changed, 2 insertions, 19 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 311320b..4513241b 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -146,27 +146,10 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME mountpoint=/
# Compress /tmp, allow exec but not setuid
- /tmp mountpoint=/tmp,exec=on,setuid=off
-
- # Don't mount /usr so that 'base' files go to the BEROOT
- /usr mountpoint=/usr,canmount=off
-
- # Home directories separated so they are common to all BEs
- /usr/home # NB: /home is a symlink to /usr/home
-
- # Ports tree
- /usr/ports setuid=off
-
- # Source tree (compressed)
- /usr/src
+ /tmp mountpoint=/tmp,exec=on,setuid=off,canmount=noauto
# Create /var and friends
- /var mountpoint=/var,canmount=off
- /var/audit exec=off,setuid=off
- /var/crash exec=off,setuid=off
- /var/log exec=off,setuid=off
- /var/mail atime=on
- /var/tmp setuid=off
+ /var mountpoint=/var,canmount=noauto
" # END-QUOTE
#
OpenPOWER on IntegriCloud