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

[Allan Jude]

Author: allanjude
Date: Tue May 10 14:38:43 2016
New Revision: 299366
URL: https://svnweb.freebsd.org/changeset/base/299366

Log:
  bsdinstall/zfsboot: Do not mirror swap when swapsize is 0
  
  PR:		209415
  Submitted by:	Ganael LAPLANCHE <ganael.laplanche at corp.ovh.com>
  MFC after:	2 weeks

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

Modified: head/usr.sbin/bsdinstall/scripts/zfsboot
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/zfsboot	Tue May 10 12:47:36 2016	(r299365)
+++ head/usr.sbin/bsdinstall/scripts/zfsboot	Tue May 10 14:38:43 2016	(r299366)
@@ -1233,7 +1233,7 @@ zfs_create_boot()
 	#
 	# Create the gmirror(8) GEOMS for swap
 	#
-	if [ "$ZFSBOOT_SWAP_MIRROR" ]; then
+	if [ ${swapsize:-0} -gt 0 -a "$ZFSBOOT_SWAP_MIRROR" ]; then
 		for disk in $disks; do
 			swap_devs="$swap_devs $disk$swappart"
 		done