summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2015-01-14 14:49:05 +0000
committergjb <gjb@FreeBSD.org>2015-01-14 14:49:05 +0000
commitf0d9ad0c8593615af8fe52950188ad6ba33044a5 (patch)
tree263cf88ae1cb68847d93d163069ad034b266350f /release
parent4bf303e5af1834cdd3092175eeca7676420229c4 (diff)
downloadFreeBSD-src-f0d9ad0c8593615af8fe52950188ad6ba33044a5.zip
FreeBSD-src-f0d9ad0c8593615af8fe52950188ad6ba33044a5.tar.gz
In vm_extra_install_base(), do not install waagent
in the openstack image, because it is not used. This appears to be a copy mistake. Remove vm_extra_install_base() from the openstack.conf entirely, since it does not need to be overridden. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r--release/tools/openstack.conf9
1 files changed, 0 insertions, 9 deletions
diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf
index 3e0e857..a88e0f8 100644
--- a/release/tools/openstack.conf
+++ b/release/tools/openstack.conf
@@ -9,15 +9,6 @@ export VM_EXTRA_PACKAGES="net/cloud-init"
# Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="cloudinit"
-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() {
echo 'sshd_enable="YES"' >> ${DESTDIR}/etc/rc.conf
echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
OpenPOWER on IntegriCloud