Date: Wed, 14 Jan 2015 14:49:05 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r277180 - projects/release-vmimage/release/tools Message-ID: <201501141449.t0EEn5Fk028012@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Wed Jan 14 14:49:05 2015 New Revision: 277180 URL: https://svnweb.freebsd.org/changeset/base/277180 Log: 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 Modified: projects/release-vmimage/release/tools/openstack.conf Modified: projects/release-vmimage/release/tools/openstack.conf ============================================================================== --- projects/release-vmimage/release/tools/openstack.conf Wed Jan 14 14:04:29 2015 (r277179) +++ projects/release-vmimage/release/tools/openstack.conf Wed Jan 14 14:49:05 2015 (r277180) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501141449.t0EEn5Fk028012>