diff options
| author | Renato Botelho <renato@netgate.com> | 2016-03-18 10:46:38 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-03-18 10:46:38 -0300 |
| commit | 7ad21b623013ad341bedcb7c1f59d0a0a7eec503 (patch) | |
| tree | 2b2de4a84af213c2ef86cd901a7682e853bf30bf /usr.sbin | |
| parent | 89ba6d490219156dc7e7779431d9de445220df9d (diff) | |
| parent | 56968099e7a910d35e62a969c6b05d6248ce1325 (diff) | |
| download | FreeBSD-src-7ad21b623013ad341bedcb7c1f59d0a0a7eec503.zip FreeBSD-src-7ad21b623013ad341bedcb7c1f59d0a0a7eec503.tar.gz | |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'usr.sbin')
| -rwxr-xr-x | usr.sbin/bsdinstall/scripts/zfsboot | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 481b876..4bf98c9 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -302,7 +302,7 @@ msg_swap_mirror_help="Mirror swap partitions for redundancy, breaks crash dumps" 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 |
