From: Florian Eckert <redacted>
Date: Wed, 24 Jun 2020 14:09:56 +0000 (+0200)
Subject: collectd: move include line
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=50f56c2ede8dc57464a94bdff4dce36ac3fe04dd;p=openwrt-packages.git

collectd: move include line

Currently the init script generates a config file from uci, that has the
include line before the interval line. This means, that anything happening
in the include directory does not yet see the changed Interval.

Moving the include line before the uci generation process fix this issue.

Signed-off-by: Florian Eckert <redacted>
---

diff --git a/utils/collectd/files/collectd.init b/utils/collectd/files/collectd.init
index b07416f4e..7400194b0 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"
 
@@ -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