diff options
| author | gjb <gjb@FreeBSD.org> | 2015-01-16 15:37:07 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-01-16 15:37:07 +0000 |
| commit | 0d86658a18173622e67d50e85f1d133e1c87e12c (patch) | |
| tree | 3c46a10aab2e465a0908d7b842c19b22994d3480 /release | |
| parent | 8bf2cea4c97e61d36323362dd55e1fb300c7e562 (diff) | |
| download | FreeBSD-src-0d86658a18173622e67d50e85f1d133e1c87e12c.zip FreeBSD-src-0d86658a18173622e67d50e85f1d133e1c87e12c.tar.gz | |
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
Diffstat (limited to 'release')
| -rw-r--r-- | release/tools/azure.conf | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 3e4a486..922f8d9 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 |
