applications/luci-statistics: init fixes

diff --git a/applications/luci-statistics/root/etc/init.d/luci_statistics b/applications/luci-statistics/root/etc/init.d/luci_statistics
index b33536441e0ac86e34c1315bb3c79a5de1b62e29..936f3a63c37aab08588f7c3966fe296a0ee67ee7 100755 (executable)
--- a/applications/luci-statistics/root/etc/init.d/luci_statistics
+++ b/applications/luci-statistics/root/etc/init.d/luci_statistics
@@ -1,27 +1,6 @@
 #!/bin/sh /etc/rc.common
 START=79
 
-boot() {
-       ### prepare publisher
-       if ! uci get lucid.rrdimg >/dev/null 2>/dev/null; then
-               uci batch <<-EOF
-set lucid.rrdimg=DirectoryPublisher
-set lucid.rrdimg.name='Statistics Images'
-set lucid.rrdimg.physical=/tmp/rrdimg
-set lucid.rrdimg.virtual=/rrdimg
-set lucid.rrdimg.domain=''
-
-add_list lucid.http.publisher=rrdimg
-add_list lucid.https.publisher=rrdimg  
-
-commit lucid
-EOF
-               /etc/init.d/lucid restart
-       fi
-
-       start
-}
-
 start() {
        ### replace shipped config with symlink
        if [ ! -L /etc/collectd.conf ]; then
@@ -34,15 +13,13 @@ start() {
        /usr/bin/stat-genconfig > /var/etc/collectd.conf
 
        ### prepare rrdimg directory
-       if [ "$(uci get luci_statistics.rrdtool.image_path 2>/dev/null)" != "$(uci get lucid.rrdimg.physical 2>/dev/null)" ]; then
-               uci set lucid.rrdimg.physical=$(uci get luci_statistics.rrdtool.image_path)
+       if [ -f /etc/config/lucid ] && [ -x /etc/init.d/lucid ] && /etc/init.d/lucid enabled && \
+          [ "$(uci get luci_statistics.rrdtool.image_path 2>/dev/null)" != "$(uci get lucid.statistics.physical 2>/dev/null)" ]; then
+               uci set lucid.statistics.physical=$(uci get luci_statistics.rrdtool.image_path)
                uci commit lucid
                /etc/init.d/lucid restart
        fi
 
-       ### flush LuCI index cache
-       test -f /var/luci-indexcache && rm /var/luci-indexcache
-
        ### workaround broken permissions on /tmp
        chmod 1777 /tmp
 }