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

[Allan Jude]

Author: allanjude
Date: Tue May 24 00:23:39 2016
New Revision: 300546
URL: https://svnweb.freebsd.org/changeset/base/300546

Log:
  Only set kern.geom.part.mbr.enforce_chs=0 once, instead of once per disk
  
  Sponsored by:	ScaleEngine Inc.

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Tue May 24 00:22:29 2016	(r300545)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Tue May 24 00:23:39 2016	(r300546)
@@ -806,7 +806,6 @@ zfs_create_diskpart()
 	if [ "$ZFSBOOT_FORCE_4K_SECTORS" ]; then
 		align_small="-a 4k"
 		align_big="-a 1m"
-		sysctl kern.geom.part.mbr.enforce_chs=0
 	fi
 
 	case "$ZFSBOOT_PARTITION_SCHEME" in
@@ -1133,6 +1132,7 @@ zfs_create_boot()
 		f_dprintf "$funcname: With 4K sectors..."
 		f_eval_catch $funcname sysctl "$SYSCTL_ZFS_MIN_ASHIFT_12" \
 		    || return $FAILURE
+		sysctl kern.geom.part.mbr.enforce_chs=0
 	fi
 	local n=0
 	for disk in $disks; do