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

[Allan Jude]

Author: allanjude
Date: Mon May 23 15:11:01 2016
New Revision: 300509
URL: https://svnweb.freebsd.org/changeset/base/300509

Log:
  Fix error in bsdinstall where additional filesystems cannot be mounted
  
  Do not set canmount=noauto on the boot environment at create time, because
  this causes / to not be mounted, and since the chroot is read only, new
  mountpoints cannot be created.
  
  The property is set later, when other properties are adjusted
  
  Reported by:	HardenedBSD
  Sponsored by:	ScaleEngine Inc.

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Mon May 23 13:59:48 2016	(r300508)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Mon May 23 15:11:01 2016	(r300509)
@@ -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=/,canmount=noauto
+	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/
 
 	# Compress /tmp, allow exec but not setuid
 	/tmp		mountpoint=/tmp,exec=on,setuid=off
@@ -1310,6 +1310,10 @@ zfs_create_boot()
 		"mountpoint=/$zroot_name" "$zroot_name" ||
 		return $FAILURE
 
+	f_dprintf "$funcname: Set canmount=noauto for the root of the pool..."
+	f_eval_catch $funcname zfs "$ZFS_SET" "canmount=noauto" \
+		"$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"
+
 	# Touch up permissions on the tmp directories
 	f_dprintf "$funcname: Modifying directory permissions..."
 	local dir