Index: stable/10/release/Makefile.azure
===================================================================
--- stable/10/release/Makefile.azure	(revision 285048)
+++ stable/10/release/Makefile.azure	(revision 285049)
@@ -1,53 +1,53 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Microsoft Azure disk images.
 #
 
 AZURE_IMG?=		${.OBJDIR}/azure.vhdf
 AZURE_UPLOAD_TGTS=	azure-check-depends \
 			azure-do-upload
 CLEANFILES+=		${AZURE_UPLOAD_TGTS}
 
 .if defined(AZURE_UPLOAD_CONF) && !empty(AZURE_UPLOAD_CONF)
 . for VAR in _STORAGE _ACCOUNT _KEY
 AZURE${VAR}!=	grep -E ^AZURE${VAR} ${AZURE_UPLOAD_CONF} | awk -F'	' '{print $$2}'
 . endfor
 .endif
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
 .endif
 
 AZURE_TARGET:=		${OSRELEASE}${SNAPSHOT_DATE}.vhd
 
 azure-upload:		${AZURE_UPLOAD_TGTS}
 
 azure-check-depends:
 .for VAR in _STORAGE _ACCOUNT _KEY
 . if !defined(AZURE${VAR}) || empty(AZURE${VAR})
 	@echo "Variable AZURE${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/azure)
 . if !exists(/usr/local/bin/npm)
 .  if !exists(${PORTSDIR}/www/npm/Makefile)
 .   if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .   endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y www/npm
 .  else
 	make -C ${PORTSDIR}/www/npm BATCH=1 all install clean
 .  endif
 . endif
 	npm install -g azure-cli
 .endif
 
 azure-do-upload:
 	/usr/local/bin/azure storage blob upload \
 		${AZURE_IMG} ${AZURE_STORAGE} ${AZURE_TARGET} \
 		-t page -a ${AZURE_ACCOUNT} -k "${AZURE_KEY}"
 	touch ${.OBJDIR}/${.TARGET}
 
Index: stable/10/release/Makefile.ec2
===================================================================
--- stable/10/release/Makefile.ec2	(revision 285048)
+++ stable/10/release/Makefile.ec2	(revision 285049)
@@ -1,59 +1,59 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for creating an EC2 AMI from a disk image.
 #
 
 .if ${BRANCH} == "CURRENT" || ${BRANCH} == "STABLE" || ${BRANCH} == "PRERELEASE"
-AMINAMESUFFIX!=	date +-%Y-%m-%d-%H-%M
+AMINAMESUFFIX!=	date +-%Y-%m-%d
 .endif
 .if defined(EC2PUBLIC)
 PUBLISH=	--public
 .endif
 
 CLEANFILES+=		ec2ami
 
 .if !exists(/usr/local/bin/bsdec2-image-upload)
 CW_EC2_PORTINSTALL=	cw-ec2-portinstall
 CLEANFILES+=		${CW_EC2_PORTINSTALL}
 .else
 CW_EC2_PORTINSTALL=
 .endif
 
 cw-ec2-portinstall:
 .if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile)
 	make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean
 .else
 . if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
 . endif
 	env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload
 .endif
 	@touch ${.TARGET}
 
 ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL}
 .if !defined(AWSKEYFILE) || !exists(${AWSKEYFILE})
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSKEYFILE must point at AWS keys for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSREGION)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSREGION must be specified EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 .if !defined(AWSBUCKET)
 	@echo "--------------------------------------------------------------"
 	@echo ">>> AWSBUCKET must be specified for EC2 AMI creation"
 	@echo "--------------------------------------------------------------"
 	@false
 .endif
 	/usr/local/bin/bsdec2-image-upload ${PUBLISH} \
 	    ${.OBJDIR}/ec2.raw \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \
 	    "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \
 	    ${AWSREGION} ${AWSBUCKET} ${AWSKEYFILE}
 	@touch ${.TARGET}
Index: stable/10/release/Makefile.gce
===================================================================
--- stable/10/release/Makefile.gce	(revision 285048)
+++ stable/10/release/Makefile.gce	(revision 285049)
@@ -1,69 +1,69 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for uploading Google Compute Engine disk images.
 #
 
 GCE_IMG?=		${.OBJDIR}/gce.raw
 GCE_UPLOAD_TGTS=	gce-check-depends \
 			gce-do-package \
 			gce-do-upload
 # I do not yet have a better way to deal with the "must be run interactively"
 # thing, so this is a fail-safe "do not do anything."
 .if !defined(GCE_LOGIN_SKIP) || empty(GCE_LOGIN_SKIP)
 GCE_UPLOAD_TGTS=	gce-do-login
 .endif
 CLEANFILES+=		${GCE_UPLOAD_TGTS}
 
 GCE_BUCKET?=
 
 .if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
-SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
 .endif
 
 # Really?  Uppercase characters are not allowed?  Sigh...
 # And don't even get me started on the '.'.
 GCE_TARGET:=		${OSRELEASE:S,.raw,,:tl:S,.,-,g}${SNAPSHOT_DATE}
 
 gce-upload:		${GCE_UPLOAD_TGTS}
 
 gce-check-depends:
 .for VAR in _BUCKET
 . if !defined(GCE${VAR}) || empty(GCE${VAR})
 	@echo "Variable GCE${VAR} cannot be empty."
 	@false
 . endif
 .endfor
 .if !exists(/usr/local/bin/gcutil)
-. if !exists(${PORTSDIR}/net/google-cloud-api/Makefile)
+. if !exists(${PORTSDIR}/net/google-cloud-sdk/Makefile)
 .  if !exists(/usr/local/sbin/pkg-static)
 	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
 .  endif
-	env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-api
+	env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk
 . else
-	make -C ${PORTSDIR}/net/google-cloud-api BATCH=1 all install clean
+	make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean
 . endif
 .endif
 
 gce-do-package:
 	@# Yes, really...  Sigh.
 	cd ${.OBJDIR} && mv gce.raw disk.raw
 	cd ${.OBJDIR} && tar --format=gnutar -zcf \
 		${GCE_TARGET:S,${.OBJDIR}/,,}.tar.gz disk.raw
 	cd ${.OBJDIR} && mv disk.raw gce.raw
 	touch ${.OBJDIR}/${.TARGET}
 
 gce-do-login:
 	@echo "This requires human interaction, which is not yet supported."
 	@true
 
 gce-do-upload:
 	@# Fallthrough in case the bucket already exists.
 	/usr/local/bin/gsutil mb gs://${GCE_BUCKET} || true
 	/usr/local/bin/gsutil cp ${.OBJDIR}/${GCE_TARGET}.tar.gz \
 		gs://${GCE_BUCKET}/
 	/usr/local/bin/gcutil addimage ${GCE_TARGET} \
 		gs://${GCE_BUCKET}/${GCE_TARGET}.tar.gz
 	touch ${.OBJDIR}/${.TARGET}
 
Index: stable/10/release/Makefile.vagrant
===================================================================
--- stable/10/release/Makefile.vagrant	(nonexistent)
+++ stable/10/release/Makefile.vagrant	(revision 285049)
@@ -0,0 +1,94 @@
+#
+# $FreeBSD$
+#
+#
+# Makefile for uploading Vagrant boxes to Hashicorp Atlas
+#
+
+VAGRANT_IMG?=		${.OBJDIR}/vagrant.vmdk
+VAGRANT_UPLOAD_TGTS=	vagrant-check-depends \
+			atlas-do-upload
+CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
+
+.if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
+. for VAR in _KEY _USERNAME
+VAGRANT${VAR}!=		grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
+ATLAS${VAR}:=		${VAGRANT${VAR}}
+. endfor
+.endif
+
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
+SNAPSHOT_DATE!=		date +-%Y-%m-%d
+.endif
+
+VAGRANT_VERSION?=	${REVISION}-${BRANCH}${SNAPSHOT_DATE}
+
+VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}.box
+VAGRANT_PROVIDERS?=	vmware_desktop
+#VAGRANT_PROVIDERS+=	virtualbox
+
+vagrant-upload:		${VAGRANT_UPLOAD_TGTS}
+
+vagrant-check-depends:
+.for VAR in _KEY _USERNAME _VERSION
+. if !defined(VAGRANT${VAR}) || empty(VAGRANT${VAR})
+	@echo "Variable VAGRANT${VAR} cannot be empty."
+	@false
+. endif
+.endfor
+.if !exists(/usr/local/bin/curl)
+. if !exists(${PORTSDIR}/ftp/curl/Makefile)
+.  if !exists(/usr/local/sbin/pkg-static)
+	env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf
+.  endif
+	env ASSUME_ALWAYS_YES=yes pkg install -y curl
+. else
+	make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean
+. endif
+.endif
+
+vagrant-do-package: cw-vagrant
+
+vagrant-do-package-vmware: vagrant-create-vmware-vmx vagrant-do-package
+	@cd ${.OBJDIR} && echo '{"provider":"vmware_desktop"}' > metadata.json
+	cd ${.OBJDIR} && tar -czf ${VAGRANT_TARGET} metadata.json vagrant.vmx vagrant.vmdk
+	touch ${.OBJDIR}/${.TARGET}
+
+atlas-do-upload: vagrant-do-package-vmware
+.for PROVIDER in ${VAGRANT_PROVIDERS}
+	${.CURDIR}/scripts/atlas-upload.sh -b FreeBSD-${REVISION}-${BRANCH} -f ${VAGRANT_TARGET} -p ${PROVIDER} -k ${VAGRANT_KEY} -u ${VAGRANT_USERNAME} -v ${VAGRANT_VERSION}
+.endfor
+	touch ${.OBJDIR}/${.TARGET}
+
+vagrant-create-vmware-vmx:
+	@cd ${.OBJDIR} && echo '.encoding = "UTF-8"' > vagrant.vmx
+	@cd ${.OBJDIR} && echo 'bios.bootorder = "hdd,CDROM"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'checkpoint.vmstate = ""' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'cleanshutdown = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'config.version = "8"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'displayname = "${VAGRANT_TARGET}"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.addresstype = "generated"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.bsdname = "en0"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.connectiontype = "nat"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.displayname = "Ethernet"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.linkstatepropagation.enable = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.pcislotnumber = "33"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.present = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.virtualdev = "e1000"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'ethernet0.wakeonpcktrcv = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'floppy0.present = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'guestos = "freebsd-64"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'gui.fullscreenatpoweron = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'gui.viewmodeatpoweron = "windowed"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'memsize = "512"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'sound.startconnected = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'softpoweroff = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'scsi0.pcislotnumber = "16"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'scsi0.present = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'scsi0.virtualdev = "lsilogic"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'scsi0:0.filename = "vagrant.vmdk"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'scsi0:0.present = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'tools.synctime = "TRUE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'usb.present = "FALSE"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'virtualhw.productcompatibility = "hosted"' >> vagrant.vmx
+	@cd ${.OBJDIR} && echo 'virtualhw.version = "9"' >> vagrant.vmx

Property changes on: stable/10/release/Makefile.vagrant
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10/release/Makefile.vm
===================================================================
--- stable/10/release/Makefile.vm	(revision 285048)
+++ stable/10/release/Makefile.vm	(revision 285049)
@@ -1,158 +1,163 @@
 #
 # $FreeBSD$
 #
 #
 # Makefile for building virtual machine and cloud provider disk images.
 #
 
 VMTARGETS=	vm-image
 VMFORMATS?=	vhd vmdk qcow2 raw
 VMSIZE?=	20G
 VMBASE?=	vm
 
 VHD_DESC=	Azure, VirtualPC, Hyper-V, Xen disk image
 VMDK_DESC=	VMWare, VirtualBox disk image
 QCOW2_DESC=	Qemu, KVM disk image
 RAW_DESC=	Unformatted raw disk image
 
 CLOUDWARE?=	AZURE \
 		EC2 \
 		GCE \
-		OPENSTACK
+		OPENSTACK \
+		VAGRANT
 AZURE_FORMAT=	vhdf
 AZURE_DESC=	Microsoft Azure platform image
 AZURE_DISK=	${OSRELEASE}.${AZURE_FORMAT}
 EC2_FORMAT=	raw
 EC2_DESC=	Amazon EC2 image
 EC2_DISK=	${OSRELEASE}.${EC2_FORMAT}
 GCE_FORMAT=	raw
 GCE_DESC=	Google Compute Engine image
 GCE_DISK=	disk.${GCE_FORMAT}
 OPENSTACK_FORMAT=qcow2
 OPENSTACK_DESC=	OpenStack platform image
 OPENSTACK_DISK=	${OSRELEASE}.${OPENSTACK_FORMAT}
+VAGRANT_FORMAT=	vmdk
+VAGRANT_DESC=	Vagrant Image
+VAGRANT_DISK=	${OSRELEASE}.${VAGRANT_FORMAT}
 
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 . for _CW in ${CLOUDWARE}
 CLOUDTARGETS+=	cw-${_CW:tl}
 CLEANDIRS+=	cw-${_CW:tl}
 CLEANFILES+=	${_CW:tl}.img \
 		${_CW:tl}.${${_CW:tu}_FORMAT} \
 		${_CW:tl}.${${_CW:tu}_FORMAT}.raw \
 		cw${_CW:tl}-package
 CLOUDINSTALL+=	cw${_CW:tl}-install
 CLOUDPACKAGE+=	cw${_CW:tl}-package
 ${_CW:tu}IMAGE=	${_CW:tl}.${${_CW:tu}_FORMAT}
 .  if exists(${.CURDIR}/tools/${_CW:tl}.conf) && !defined(${_CW:tu}CONF)
 ${_CW:tu}CONF?=	${.CURDIR}/tools/${_CW:tl}.conf
 .  endif
 
 cw-${_CW:tl}:
 	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${.OBJDIR}/${_CW:tl}.img -s ${VMSIZE} -f ${${_CW}_FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${${_CW}IMAGE} -c ${${_CW}CONF}
 	touch ${.TARGET}
 
 cw${_CW:tl}-install:
 	mkdir -p ${DESTDIR}/${_CW:tl}
 	cp -p ${${_CW}IMAGE} \
 		${DESTDIR}/${_CW:tl}/${${_CW}_DISK}
 	cd ${DESTDIR}/${_CW:tl} && sha256 ${${_CW}_DISK}* > \
 		${DESTDIR}/${_CW:tl}/CHECKSUM.SHA256
 	cd ${DESTDIR}/${_CW:tl} && md5 ${${_CW}_DISK}* > \
 		${DESTDIR}/${_CW:tl}/CHECKSUM.MD5
 
 cw${_CW:tl}-package:
 	@# Special target to handle packaging cloud images in the formats
 	@# specific to each hosting provider.
 .if exists(${.CURDIR}/tools/${_CW:tl}-package.sh)
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/tools/${_CW:tl}-package.sh \
 		-D ${DESTDIR} -I ${${_CW}_DISK} -S ${WORLDDIR}
 .endif
 	touch ${.TARGET}
 
 . endfor
 .endif
 
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 CLEANDIRS+=	${VMTARGETS}
 . for FORMAT in ${VMFORMATS}
 CLEANFILES+=	${FORMAT}.img
 CLEANFILES+=	${VMBASE}.${FORMAT}
 . endfor
 .endif
 
 vm-base:	vm-image
 
 vm-image:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 . for FORMAT in ${VMFORMATS}
 	mkdir -p ${.OBJDIR}/${.TARGET}
 	env TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		${.CURDIR}/scripts/mk-vmimage.sh \
 		-C ${.CURDIR}/tools/vmimage.subr -d ${.OBJDIR}/${.TARGET} \
 		-i ${.OBJDIR}/${FORMAT}.img -s ${VMSIZE} -f ${FORMAT} \
 		-S ${WORLDDIR} -o ${.OBJDIR}/${VMBASE}.${FORMAT}
 . endfor
 .endif
 	touch ${.TARGET}
 
 vm-cloudware:	${CLOUDTARGETS}
 
 list-vmtargets:	list-cloudware
 	@${ECHO}
 	@${ECHO} "Supported virtual machine disk image formats:"
 .for FORMAT in ${VMFORMATS:tu}
 	@${ECHO} "  ${FORMAT:tl}: ${${FORMAT}_DESC}"
 .endfor
 
 list-cloudware:
 .if !empty(CLOUDWARE)
 	@${ECHO}
 	@${ECHO} "Supported cloud hosting provider images:"
 . for _CW in ${CLOUDWARE}
 	@${ECHO} "  ${_CW:tu}: ${${_CW:tu}_DESC}"
 . endfor
 .endif
 
 vm-install:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	mkdir -p ${DESTDIR}/vmimages
 . for FORMAT in ${VMFORMATS}
 	cp -p ${VMBASE}.${FORMAT} \
 		${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 . endfor
 . if defined(WITH_COMPRESSED_VMIMAGES) && !empty(WITH_COMPRESSED_VMIMAGES)
 .  for FORMAT in ${VMFORMATS}
 	# Don't keep the originals.  There is a copy in ${.OBJDIR} if needed.
 	${XZCMD} ${DESTDIR}/vmimages/${OSRELEASE}.${FORMAT}
 .  endfor
 . endif
 	cd ${DESTDIR}/vmimages && sha256 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.SHA256
 	cd ${DESTDIR}/vmimages && md5 ${OSRELEASE}* > \
 		${DESTDIR}/vmimages/CHECKSUM.MD5
 .endif
 
 vm-release:
 .if defined(WITH_VMIMAGES) && !empty(WITH_VMIMAGES)
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${VMTARGETS}
 .endif
 
 cloudware-release:
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDTARGETS}
 .endif
 
 cloudware-install:
 .if defined(WITH_CLOUDWARE) && !empty(WITH_CLOUDWARE) && !empty(CLOUDWARE)
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${CLOUDINSTALL}
 .endif
 
 .include "${.CURDIR}/Makefile.ec2"
 .include "${.CURDIR}/Makefile.azure"
 .include "${.CURDIR}/Makefile.gce"
+.include "${.CURDIR}/Makefile.vagrant"
Index: stable/10/release/scripts/atlas-upload.sh
===================================================================
--- stable/10/release/scripts/atlas-upload.sh	(nonexistent)
+++ stable/10/release/scripts/atlas-upload.sh	(revision 285049)
@@ -0,0 +1,155 @@
+#!/bin/sh
+#-
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# Upload a Vagrant image to Hashicorp's Atlas service
+#
+# $FreeBSD$
+#
+
+ATLAS_API_URL=''
+ATLAS_UPLOAD_URL='https://binstore.hashicorp.com'
+VERSION_DESCRIPTION="FreeBSD Snapshot Build"
+
+usage() {
+	echo "${0} usage:"
+	echo "-b box-name -f box-to-upload -k api-key -p provider -u user -v version"
+	return 1
+}
+
+main () {
+	while getopts "b:f:k:p:u:v:" arg; do
+		case "${arg}" in
+			b)
+				BOX="${OPTARG}"
+				;;
+			f)
+				FILE="${OPTARG}"
+				;;
+			k)
+				KEY="${OPTARG}"
+				;;
+			p)
+				PROVIDER="${OPTARG}"
+				;;
+			u)
+				USERNAME="${OPTARG}"
+				;;
+			v)
+				VERSION="${OPTARG}"
+				;;
+			*)
+				;;
+		esac
+	done
+
+	if [ -z "${BOX}" -o \
+		-z "${FILE}" -o \
+		-z "${KEY}" -o \
+		-z "${PROVIDER}" -o \
+		-z "${USERNAME}" -o \
+		-z "${VERSION}" ];
+	then
+		usage || exit 0
+	fi
+
+	# Check to see if the box exists or create it
+	BOXRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}?access_token=${KEY}")
+	if [ $? != 0 ]; then
+		echo "Failed to connect to the API"
+		exit 2;
+	fi
+	echo $BOXRESULT | grep "\"name\":\"${BOX}\"" > /dev/null
+	if [ $? != 0 ]; then
+		echo "Creating box: ${BOX}"
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/boxes -X POST -d "box[name]=${BOX}" -d "access_token=${KEY}" > /dev/null
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX} -X PUT -d "box[is_private]=false" -d "access_token=${KEY}" > /dev/null
+	else
+		echo "Box already exists"
+	fi
+
+	# Check to see if the version exists or create it
+	VERSIONRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}")
+	if [ $? != 0 ]; then
+		echo "Failed to connect to the API"
+		exit 2;
+	fi
+	echo $VERSIONRESULT | grep "\"version\":\"${VERSION}\"" > /dev/null
+	if [ $? != 0 ]; then
+		echo "Creating version: ${VERSION}"
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/versions -X POST -d "version[version]=${VERSION}" -d "access_token=${KEY}" > /dev/null
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION} -X PUT -d "version[description]=${VERSION_DESCRIPTION}" -d "access_token=${KEY}" > /dev/null
+		VERSIONRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}?access_token=${KEY}")
+		echo $VERSIONRESULT | grep "\"version\":\"${VERSION}\"" > /dev/null
+		if [ $? != 0 ]; then
+			echo "Failed to create version"
+			exit 2
+		fi
+	else
+		echo "Version already exists"
+	fi
+
+	# Check to see if the provider exists or create it
+	PROVIDERRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}")
+	if [ $? != 0 ]; then
+		echo "Failed to connect to the API"
+		exit 2;
+	fi
+	echo $PROVIDERRESULT | grep "\"name\":\"${PROVIDER}\"" > /dev/null
+	if [ $? != 0 ]; then
+		echo "Creating provider: ${PROVIDER}"
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/providers -X POST -d "provider[name]=${PROVIDER}" -d "access_token=${KEY}" > /dev/null
+	else
+		echo "Provider already exists"
+	fi
+
+	# Request an upload token
+	TOKENRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}/upload?access_token=${KEY}")
+	if [ $? != 0 ]; then
+		echo "Failed to get the token from the API"
+		exit 2;
+	fi
+	echo ${TOKENRESULT} | grep "\"token\":" > /dev/null
+	if [ $? != 0 ]; then
+		echo "No token found from the API"
+		exit 2
+	else
+		TOKEN=$(echo $TOKENRESULT | sed -e 's/.*token":"//' -e 's/".*//')
+		echo "Uploading to Atlas"
+		UPLOADRESULT=$(/usr/local/bin/curl -s -X PUT --upload-file ${FILE} ${ATLAS_UPLOAD_URL}/${TOKEN})
+
+		# Validate the Upload
+		echo "Validating"
+		VALIDRESULT=$(/usr/local/bin/curl -s "https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/provider/${PROVIDER}?access_token=${KEY}")
+		HOSTED_TOKEN=$(echo $VALIDRESULT | sed -e 's/.*hosted_token":"//' -e 's/".*//')
+		if [ ! -z ${HOSTED_TOKEN} -a ! -z ${TOKEN} -a ${HOSTED_TOKEN} != ${TOKEN} ]; then
+			echo "Upload failed, try again."
+			exit 2
+		fi
+
+		# Release the version
+		echo "Releasing ${VERSION} of ${BOX} in Atlas"
+		/usr/local/bin/curl -s https://atlas.hashicorp.com/api/v1/box/${USERNAME}/${BOX}/version/${VERSION}/release -X PUT -d "access_token=${KEY}" > /dev/null
+	fi
+}
+
+main "$@"

Property changes on: stable/10/release/scripts/atlas-upload.sh
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10/release/tools/vagrant.conf
===================================================================
--- stable/10/release/tools/vagrant.conf	(nonexistent)
+++ stable/10/release/tools/vagrant.conf	(revision 285049)
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# Packages to install into the image we're creating.  This is a deliberately
+# minimalist set, providing only the packages necessary to bootstrap.
+export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs"
+
+# Set to a list of third-party software to enable in rc.conf(5).
+export VM_RC_LIST="firstboot_freebsd_update firstboot_pkgs"
+
+vm_extra_pre_umount() {
+	# The firstboot_pkgs rc.d script will download the repository
+	# catalogue and install or update pkg when the instance first
+	# launches, so these files would just be replaced anyway; removing
+	# them from the image allows it to boot faster.
+	env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
+	rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
+
+	# The size of the EC2 root disk can be configured at instance launch
+	# time; expand our filesystem to fill the disk.
+	echo 'growfs_enable="YES"' >> ${DESTDIR}/etc/rc.conf
+
+	# Vagrant instances use DHCP to get their network configuration.
+	echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
+
+	# Enable sshd by default
+	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
+	# Disable DNS lookups by default to make SSH connect quickly
+	echo 'UseDNS no' >> ${DESTDIR}/etc/ssh/sshd_config
+
+	# Disable sendmail
+	echo 'sendmail_enable="NO"' >> ${DESTDIR}/etc/rc.conf
+	echo 'sendmail_submit_enable="NO"' >> ${DESTDIR}/etc/rc.conf
+	echo 'sendmail_outbound_enable="NO"' >> ${DESTDIR}/etc/rc.conf
+	echo 'sendmail_msp_queue_enable="NO"' >> ${DESTDIR}/etc/rc.conf
+
+	# sudo is required
+	echo 'firstboot_pkgs_list="sudo rsync"' >> ${DESTDIR}/etc/rc.conf
+
+	# Create the vagrant user with a password of vagrant
+	/usr/sbin/pw -R ${DESTDIR} \
+		groupadd vagrant -g 1001
+	chroot ${DESTDIR} mkdir -p /home/vagrant
+	/usr/sbin/pw -R ${DESTDIR} \
+		useradd vagrant \
+		-m -M 0755 -w yes -n vagrant -u 1001 -g 1001 -G 0 \
+		-c 'Vagrant User' -d '/home/vagrant' -s '/bin/csh'
+
+	# Change root's password to vagrant
+	echo 'vagrant' | /usr/sbin/pw -R ${DESTDIR} \
+		usermod root -h 0
+
+	# Configure sudo to allow the vagrant user
+	echo 'vagrant ALL=(ALL) NOPASSWD: ALL' >> ${DESTDIR}/usr/local/etc/sudoers
+
+	# Configure the vagrant ssh key
+	mkdir ${DESTDIR}/home/vagrant/.ssh
+	chmod 700 ${DESTDIR}/home/vagrant/.ssh
+	echo "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEA6NF8iallvQVp22WDkTkyrtvp9eWW6A8YVr+kz4TjGYe7gHzIw+niNltGEFHzD8+v1I2YJ6oXevct1YeS0o9HZyN1Q9qgCgzUFtdOKLv6IedplqoPkcmF0aYet2PkEDo3MlTBckFXPITAMzF8dJSIFo9D8HfdOV0IAdx4O7PtixWKn5y2hMNG0zQPyUecp4pzC6kivAIhyfHilFR61RGL+GPXQ2MWZWFYbAGjyiYJnAmCP3NOTd0jMZEnDkbUvxhMmBYSdETk1rRgm+R4LOzFUGaHqHDLKLX+FIPKcF96hrucXzcWyLbIbEgE98OHlnVYCzRdK8jlqm8tehUc9c9WhQ== vagrant insecure public key" > ${DESTDIR}/home/vagrant/.ssh/authorized_keys
+	chown -R 1001 ${DESTDIR}/home/vagrant/.ssh
+	chmod 600 ${DESTDIR}/home/vagrant/.ssh/authorized_keys
+
+	# Reboot quickly, Don't wait at the panic screen
+	echo 'debug.trace_on_panic=1' >> ${DESTDIR}/etc/sysctl.conf
+	echo 'debug.debugger_on_panic=0' >> ${DESTDIR}/etc/sysctl.conf
+	echo 'kern.panic_reboot_wait_time=0' >> ${DESTDIR}/etc/sysctl.conf
+
+	# The console is not interactive, so we might as well boot quickly.
+	echo 'autoboot_delay="-1"' >> ${DESTDIR}/boot/loader.conf
+
+	# The first time the VM boots, the installed "first boot" scripts
+	# should be allowed to run:
+	# * growfs (expand the filesystem to fill the provided disk)
+	# * firstboot_freebsd_update (install critical updates)
+	# * firstboot_pkgs (install packages)
+	touch ${DESTDIR}/firstboot
+
+	return 0
+}

Property changes on: stable/10/release/tools/vagrant.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: stable/10
===================================================================
--- stable/10	(revision 285048)
+++ stable/10	(revision 285049)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r284893,284895-284897,284942,284968,284996,285005