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
This commit is contained in:
Glen Barber 2015-01-16 15:37:07 +00:00
parent 5e87068875
commit 0cdabd97fb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/projects/release-vmimage/; revision=277250

View file

@ -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