svn commit: r300425 - head/usr.sbin/bsdinstall/scripts

[Allan Jude]

Author: allanjude
Date: Sun May 22 16:24:21 2016
New Revision: 300425
URL: https://svnweb.freebsd.org/changeset/base/300425

Log:
  Fix default ZFS layout to work better by default with sysutils/beadm
  
  The root file system is mounted early via vfs.root.mountfrom.
  The canmount=noauto property only affects the zfs rc.d script.
  This ensures that the 'default' BE is not mounted overtop of another BE when
  one is selected from the beastie menu
  
  Sponsored by:	ScaleEngine Inc.

Modified:
  head/usr.sbin/bsdinstall/scripts/zfsboot

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Sun May 22 15:22:45 2016	(r300424)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Sun May 22 16:24:21 2016	(r300425)
@@ -143,7 +143,7 @@ f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATA
 
 	# Boot Environment [BE] root and default boot dataset
 	/$ZFSBOOT_BEROOT_NAME				mountpoint=none
-	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/
+	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/,canmount=noauto
 
 	# Compress /tmp, allow exec but not setuid
 	/tmp		mountpoint=/tmp,exec=on,setuid=off