From d05eedc42c75237f3b4d6add2491f7b7498ac30f Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 7 Feb 2017 02:36:15 +0100
Subject: [PATCH] cpe: script fixes

---
 salt/cpe/ap.sh                  | 5 ++---
 salt/cpe/ap_install_collectd.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/salt/cpe/ap.sh b/salt/cpe/ap.sh
index 839a274..71bd294 100644
--- a/salt/cpe/ap.sh
+++ b/salt/cpe/ap.sh
@@ -353,12 +353,11 @@ __SH__
 chmod a+rx /usr/sbin/wifi-on-link.sh
 /etc/init.d/cron restart
 
-# TODO: install pkgs (collectd...)
-
 {%- if conf.get('firstboot') %}
 reboot
 {%- endif %}
 
 __SSH__
 
-echo "All done \\o/"
+echo "Base configuration done \\o/"
+echo "Later run: `dirname $0`/ap_install_collectd.sh {{ pillar['hosts-inet']['mgmt'][hostname] }}"
diff --git a/salt/cpe/ap_install_collectd.sh b/salt/cpe/ap_install_collectd.sh
index 53a90fb..acfbea7 100644
--- a/salt/cpe/ap_install_collectd.sh
+++ b/salt/cpe/ap_install_collectd.sh
@@ -6,7 +6,7 @@ for HOST in $@ ; do
 opkg update
 opkg install collectd collectd-mod-iwinfo collectd-mod-network
 cat > /etc/collectd.conf <<EOF
-Hostname "$HOSTNAME"
+Hostname "\$HOSTNAME"
 FQDNLookup false
 Interval 10
 
@@ -25,8 +25,8 @@ LoadPlugin network
 
 EOF
 
+/etc/init.d/collectd restart
 /etc/init.d/collectd enable
-/etc/init.d/collectd start
 
 __SSH__
 done