summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2017-01-20 13:21:47 -0200
committerRenato Botelho <renato@netgate.com>2017-01-20 13:22:06 -0200
commit783330d0bf89d2d888afcb450e754a311777a8a8 (patch)
treecdc94f384335fc397208baa1692a42aa12c99e0d
parent1b0f4cedd2059c869b9500054a18aa6377bd8fe4 (diff)
downloadFreeBSD-src-783330d0bf89d2d888afcb450e754a311777a8a8.zip
FreeBSD-src-783330d0bf89d2d888afcb450e754a311777a8a8.tar.gz
Remove canmount=noauto from /var and /tmp. Ticket #7086
-rwxr-xr-xusr.sbin/bsdinstall/scripts/zfsboot4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
index 4513241b..13df482 100755
--- a/usr.sbin/bsdinstall/scripts/zfsboot
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -146,10 +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,canmount=noauto
+ /tmp mountpoint=/tmp,exec=on,setuid=off
# Create /var and friends
- /var mountpoint=/var,canmount=noauto
+ /var mountpoint=/var
" # END-QUOTE
#
OpenPOWER on IntegriCloud