svn commit: r318811 - in stable/10/release: . tools

[Navdeep Parhar]

Author: np
Date: Wed May 24 20:34:19 2017
New Revision: 318811
URL: https://svnweb.freebsd.org/changeset/base/318811

Log:
  MFC r307008:
  
  Add the ability to override the size of the swap partition when building
  VM images.  The default continues to be 1G.
  
  Sponsored by:	Chelsio Communications

Modified:
  stable/10/release/Makefile.vm
  stable/10/release/tools/vmimage.subr
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile.vm
==============================================================================
--- stable/10/release/Makefile.vm	Wed May 24 20:33:49 2017	(r318810)
+++ stable/10/release/Makefile.vm	Wed May 24 20:34:19 2017	(r318811)
@@ -8,6 +8,7 @@
 VMTARGETS=	vm-image
 VMFORMATS?=	vhd vmdk qcow2 raw
 VMSIZE?=	20G
+SWAPSIZE?=	1G
 VMBASE?=	vm
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image

Modified: stable/10/release/tools/vmimage.subr
==============================================================================
--- stable/10/release/tools/vmimage.subr	Wed May 24 20:33:49 2017	(r318810)
+++ stable/10/release/tools/vmimage.subr	Wed May 24 20:34:19 2017	(r318811)
@@ -11,7 +11,7 @@ trap "cleanup" INT QUIT TRAP ABRT TERM
 
 write_partition_layout() {
 	if [ -z "${NOSWAP}" ]; then
-		SWAPOPT="-p freebsd-swap/swapfs::1G"
+		SWAPOPT="-p freebsd-swap/swapfs::${SWAPSIZE}"
 	fi
 
 	_OBJDIR="$(make -C ${WORLDDIR} -V .OBJDIR)"