From 25354f4fa589e8b8da0804d734deee1b2a5361cf Mon Sep 17 00:00:00 2001 From: Harm Weites Date: Sat, 23 Aug 2014 12:16:03 +0000 Subject: [PATCH] change: Rename the config file to cloud.cfg-freebsd so it doesn't get copied per default. Packaging will take care of installing this configfile on the BSD platform. --- config/{cloud.freebsd.cfg => cloud.cfg-freebsd} | 0 tools/build-on-freebsd | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename config/{cloud.freebsd.cfg => cloud.cfg-freebsd} (100%) diff --git a/config/cloud.freebsd.cfg b/config/cloud.cfg-freebsd similarity index 100% rename from config/cloud.freebsd.cfg rename to config/cloud.cfg-freebsd diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd index b0203cb8..23bdf487 100755 --- a/tools/build-on-freebsd +++ b/tools/build-on-freebsd @@ -28,8 +28,8 @@ touch $depschecked python setup.py build python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd -# Use the correct config file: -mv /usr/local/etc/cloud/cloud.freebsd.cfg /usr/local/etc/cloud/cloud.cfg +# Install the correct config file: +cp config/cloud.cfg-freebsd /usr/local/etc/cloud/cloud.cfg # Enable cloud-init in /etc/rc.conf: sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf