aboutsummaryrefslogtreecommitdiff
path: root/release/tools/azure.conf
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2015-01-16 15:37:07 +0000
committerGlen Barber <gjb@FreeBSD.org>2015-01-16 15:37:07 +0000
commit0cdabd97fb65726a1489fa365e8227eac023df92 (patch)
tree3c46a10aab2e465a0908d7b842c19b22994d3480 /release/tools/azure.conf
parent5e8706887539e6efc12953fd419182b7a1f9aa05 (diff)
downloadsrc-0cdabd97fb65726a1489fa365e8227eac023df92.tar.gz
src-0cdabd97fb65726a1489fa365e8227eac023df92.zip
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
Notes
Notes: svn path=/projects/release-vmimage/; revision=277250
Diffstat (limited to 'release/tools/azure.conf')
-rw-r--r--release/tools/azure.conf13
1 files changed, 1 insertions, 12 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf
index 3e4a4864adfe..922f8d9d406f 100644
--- a/release/tools/azure.conf
+++ b/release/tools/azure.conf
@@ -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