Index: head/release/Makefile.vagrant
===================================================================
--- head/release/Makefile.vagrant	(nonexistent)
+++ head/release/Makefile.vagrant	(revision 284893)
@@ -0,0 +1,94 @@
+#
+# $FreeBSD$
+#
+#
+# Makefile for uploading Vagrant boxes to Hashicorp Atlas
+#
+
+VAGRANT_UPLOAD_TGTS=	vagrant-check-depends \
+			vagrant-do-package-vmware
+#			atlas-do-upload
+CLEANFILES+=		${VAGRANT_UPLOAD_TGTS}
+
+.if defined(VAGRANT_UPLOAD_CONF) && !empty(VAGRANT_UPLOAD_CONF)
+. for VAR in _ACCOUNT _KEY
+VAGRANT${VAR}!=	grep -E ^VAGRANT${VAR} ${VAGRANT_UPLOAD_CONF} | awk -F'	' '{print $$2}'
+. endfor
+.endif
+
+.if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE"
+SNAPSHOT_DATE!=		date +-%Y-%m-%d-%H-%M
+.endif
+
+VAGRANT_TARGET:=	${OSRELEASE}${SNAPSHOT_DATE}.box
+
+vagrant-upload:		${VAGRANT_UPLOAD_TGTS}
+
+vagrant-check-depends:
+.for VAR in _ACCOUNT _KEY
+. 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 ftp/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-create-upload:
+.for PROVIDER in vmware_desktop virtualbox
+	/usr/local/bin/curl "https://vagrant.hashicorp.com/api/v1/box/${ATLAS_USERNAME}/${ATLAS_NAME}/version/${ATLAS_VERSION}/provider/${PROVIDER}/upload?access_token=${ATLAS_KEY}"
+.endfor
+	touch ${.OBJDIR}/${.TARGET}
+
+atlas-do-upload:
+	/usr/local/bin/curl -X PUT --upload-file \
+		${VAGRANT_IMG} ${ATLAS_UPLOAD_PATH}
+	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: head/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: head/release/Makefile.vm
===================================================================
--- head/release/Makefile.vm	(revision 284892)
+++ head/release/Makefile.vm	(revision 284893)
@@ -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.
 	${XZ_CMD} ${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: head/release/tools/vagrant.conf
===================================================================
--- head/release/tools/vagrant.conf	(nonexistent)
+++ head/release/tools/vagrant.conf	(revision 284893)
@@ -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: head/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