svn commit: r277250 - projects/release-vmimage/release/tools

[Glen Barber]

Author: gjb
Date: Fri Jan 16 15:37:07 2015
New Revision: 277250
URL: https://svnweb.freebsd.org/changeset/base/277250

Log:
  Remove vm_extra_install_base() for the Azure image, now
  that the waagent exists in the ports tree.
  
  Add sysutils/azure-agent to the VM_EXTRA_PACKAGES list.
  
  In vm_extra_pre_umount(), remove the explicit pkg(8) install
  list, as dependencies are resolved by sysutils/azure-agent.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/release-vmimage/release/tools/azure.conf

Modified: projects/release-vmimage/release/tools/azure.conf
==============================================================================
--- projects/release-vmimage/release/tools/azure.conf	Fri Jan 16 15:16:19 2015	(r277249)
+++ projects/release-vmimage/release/tools/azure.conf	Fri Jan 16 15:37:07 2015	(r277250)
@@ -6,25 +6,14 @@
 # Set to a list of packages to install.
 # Example:
 #export VM_EXTRA_PACKAGES="www/apache24"
-export VM_EXTRA_PACKAGES=
+export VM_EXTRA_PACKAGES="sysutils/azure-agent"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 # Example:
 #export VM_RC_LIST="apache24"
 export VM_RC_LIST=
 
-vm_extra_install_base() {
-	fetch -o ${DESTDIR}/usr/sbin/waagent \
-		http://people.freebsd.org/~gjb/waagent
-	chmod +x ${DESTDIR}/usr/sbin/waagent
-	rm -f ${DESTDIR}/etc/resolv.conf
-
-	return 0
-}
-
 vm_extra_pre_umount() {
-	chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes /usr/sbin/pkg install -y \
-		python python2 python27 py27-asn1 sudo bash
 	chroot ${DESTDIR} /usr/sbin/waagent -verbose -install
 	yes | chroot ${DESTDIR} /usr/sbin/waagent -deprovision
 	echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf