From: Jo-Philipp Wich <redacted>
Date: Mon, 25 Apr 2022 18:55:02 +0000 (+0200)
Subject: luci-app-statistics: stat-genconfig: don't emit bools for absent uci options
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f16037cec5e3f65cffe2f5788c264f1912435b0e;p=openwrt-luci.git

luci-app-statistics: stat-genconfig: don't emit bools for absent uci options

Do not emit native collectd.conf boolean false options if the corresponding
uci option is unset in order to honour collectd's implicit defaults.

This fixes certain options, such as the memory plugins `ValuesAbsolute`,
being without effect if declared as default-enabled in the related plugin
uci forms.

Fixes: #5777
Signed-off-by: Jo-Philipp Wich <redacted>
---

diff --git a/applications/luci-app-statistics/root/usr/bin/stat-genconfig b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
index fa59edc3a9..15e11e193e 100755
--- a/applications/luci-app-statistics/root/usr/bin/stat-genconfig
+++ b/applications/luci-app-statistics/root/usr/bin/stat-genconfig
@@ -235,13 +235,13 @@ function _bool( s, n, nopad )
 	local pad = ""
 	if not nopad then pad = "\t" end
 
-	if s and s == "1" then
-		str = pad .. n .. " true"
-	else
-		str = pad .. n .. " false"
+	if s == "1" then
+		str = pad .. n .. " true\n"
+	elseif s == "0" then
+		str = pad .. n .. " false\n"
 	end
 
-	return str .. "\n"
+	return str
 end
 
 function _string( s, n, nopad )