fix the configuration issue on FreeBSD

2 files changed, 3 insertions, 4 deletions

diff --git a/setup.py b/setup.py
index 0403607..14525f3 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,6 @@ LIB = "/lib"
 if os.uname()[0] == 'FreeBSD':
     USR = "/usr/local"
     USR_LIB_EXEC = "/usr/local/lib"
-    ETC = "/usr/local/etc"
 elif os.path.isfile('/etc/redhat-release'):
     USR_LIB_EXEC = "/usr/libexec"
 
diff --git a/tools/build-on-freebsd b/tools/build-on-freebsd
index 8436498..bdf13ca 100755
--- a/tools/build-on-freebsd
+++ b/tools/build-on-freebsd
@@ -3,7 +3,7 @@
 # installing cloud-init. This script takes care of building and installing. It
 # will optionally make a first run at the end.
 
-fail() { echo "FAILED:" "$@" 1>&2; exit 1; }
+warn() { echo "WARNING:" "$@" 1>&2; }
 
 # Check dependencies:
 depschecked=/tmp/c-i.dependencieschecked
@@ -27,7 +27,7 @@ pkgs="
    python
    sudo
 "
-[ -f "$depschecked" ] || pkg install ${pkgs} || fail "install packages"
+[ -f "$depschecked" ] || pkg install ${pkgs} || warn "install packages"
 touch $depschecked
 
 # Required but unavailable port/pkg: py27-jsonpatch py27-jsonpointer
@@ -38,7 +38,7 @@ python setup.py build
 python setup.py install -O1 --skip-build --prefix /usr/local/ --init-system sysvinit_freebsd
 
 # Install the correct config file:
-cp config/cloud.cfg-freebsd /usr/local/etc/cloud/cloud.cfg
+cp config/cloud.cfg-freebsd /etc/cloud/cloud.cfg
 
 # Enable cloud-init in /etc/rc.conf:
 sed -i.bak -e "/cloudinit_enable=.*/d" /etc/rc.conf