svn commit: r296997 - releng/10.3/usr.sbin/bsdinstall/scripts

[Allan Jude]

Author: allanjude
Date: Thu Mar 17 21:49:20 2016
New Revision: 296997
URL: https://svnweb.freebsd.org/changeset/base/296997

Log:
  MFC: r296996
    Remove 50% ZFS conditional from bsdinstall/zfsboot
  
  PR:		208094
  Approved by:	re (marius)

Modified:
  releng/10.3/usr.sbin/bsdinstall/scripts/zfsboot
Directory Properties:
  releng/10.3/   (props changed)

Modified: releng/10.3/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- releng/10.3/usr.sbin/bsdinstall/scripts/zfsboot	Thu Mar 17 21:00:43 2016	(r296996)
+++ releng/10.3/usr.sbin/bsdinstall/scripts/zfsboot	Thu Mar 17 21:49:20 2016	(r296997)
@@ -302,7 +302,7 @@ msg_swap_mirror_help="Mirror swap partit
 msg_swap_size="Swap Size"
 msg_swap_size_help="Customize how much swap space is allocated to each selected disk"
 msg_swap_toosmall="The selected swap size (%s) is to small. Please enter a value greater than 100MB or enter 0 for no swap"
-msg_these_disks_are_too_small="These disks are too small given the amount of requested\nswap (%s) and/or geli(8) (%s) partitions, which would\ntake 50%% or more of each of the following selected disk\ndevices (not recommended):\n\n  %s\n\nRecommend changing partition size(s) and/or selecting a\ndifferent set of devices."
+msg_these_disks_are_too_small="These disks are smaller than the amount of requested\nswap (%s) and/or geli(8) (%s) partitions, which would\ntake 100%% or more of each of the following selected disks:\n\n  %s\n\nRecommend changing partition size(s) and/or selecting a\ndifferent set of disks."
 msg_unable_to_get_disk_capacity="Unable to get disk capacity of \`%s'"
 msg_unsupported_partition_scheme="%s is an unsupported partition scheme"
 msg_user_cancelled="User Cancelled."
@@ -1480,11 +1480,12 @@ while :; do
 		# NB: dialog_menu_layout supports running non-interactively
 		dialog_menu_layout || continue
 
-		# Make sure each disk will be at least 50% ZFS
+		# Make sure each disk will have room for ZFS
 		if f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize &&
-		   f_expand_number "$ZFSBOOT_BOOT_POOL_SIZE" bootsize
+		   f_expand_number "$ZFSBOOT_BOOT_POOL_SIZE" bootsize &&
+		   f_expand_number "1g" zpoolmin
 		then
-			minsize=$swapsize teeny_disks=
+			minsize=$(( $swapsize + $zpoolmin )) teeny_disks=
 			[ "$ZFSBOOT_BOOT_POOL" ] &&
 				minsize=$(( $minsize + $bootsize ))
 			for disk in $ZFSBOOT_DISKS; do
@@ -1492,7 +1493,6 @@ while :; do
 					$disk $DEVICE_TYPE_DISK device
 				$device get capacity disksize || continue
 				[ ${disksize:-0} -ge 0 ] || disksize=0
-				disksize=$(( $disksize - $minsize ))
 				[ $disksize -lt $minsize ] &&
 					teeny_disks="$teeny_disks $disk"
 			done