diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index b2deb82d1..790e38f31 100644 --- a/utils/collectd/Makefile +++ b/utils/collectd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=collectd PKG_VERSION:=5.11.0 -PKG_RELEASE:=8 +PKG_RELEASE:=9 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://collectd.org/files/ \ diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init index b07416f4e..89fc6b2bb 100644 --- a/utils/collectd/files/collectd.init +++ b/utils/collectd/files/collectd.init @@ -310,10 +310,6 @@ process_config() { config_get BaseDir globals BaseDir "/var/run/collectd" printf "BaseDir \"%s\"\n" "$BaseDir" >> "$COLLECTD_CONF" - config_get Include globals Include "/tmp/collectd.d" - printf "Include \"%s\"\n" "$Include" >> "$COLLECTD_CONF" - mkdir -p "$Include" - config_get PIDFile globals PIDFile "/var/run/collectd.pid" printf "PIDFile \"%s\"\n" "$PIDFile" >> "$COLLECTD_CONF" @@ -324,7 +320,7 @@ process_config() { printf "TypesDB \"%s\"\n" "$TypesDB" >> "$COLLECTD_CONF" config_get Interval globals Interval 30 - printf "Interval \"%s\"\n" "$Interval" >> "$COLLECTD_CONF" + printf "Interval %s\n" "$Interval" >> "$COLLECTD_CONF" config_get ReadThreads globals ReadThreads 2 printf "ReadThreads \"%s\"\n" "$ReadThreads" >> "$COLLECTD_CONF" @@ -332,6 +328,10 @@ process_config() { config_get Hostname globals Hostname "$(uname -n)" printf "Hostname \"%s\"\n" "$Hostname" >> "$COLLECTD_CONF" + config_get Include globals Include "/tmp/collectd.d" + printf "Include \"%s\"\n" "$Include" >> "$COLLECTD_CONF" + mkdir -p "$Include" + printf "\n" >> "$COLLECTD_CONF" # PLUGIN CONFIG