From ee1108eba87a8d7e9c88602a85fd57b4e3a379b8 Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Wed, 14 Jan 2015 14:49:05 +0000 Subject: [PATCH] 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 --- release/tools/openstack.conf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/release/tools/openstack.conf b/release/tools/openstack.conf index 3e0e857e9d89..a88e0f8e37de 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