collect: fix cpufreq graph on some machines.

the file cpuinfo_cur_freq does not exist on all systems that support collect
cpufreq data.

fixes #11739

diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
index 000df8f5f71bf9b2c2e85531c0e0eb3d7e3cf6af..bb833fc3a10e1691f7d73a35b017a6d7602f5dae 100644 (file)
--- a/config/rootfiles/core/123/filelists/files
+++ b/config/rootfiles/core/123/filelists/files
@@ -2,6 +2,7 @@ etc/system-release
 etc/issue
 etc/rc.d/helper/aws-setup
 etc/rc.d/init.d/aws
+etc/rc.d/init.d/collectd
 etc/rc.d/rcsysinit.d/S74aws
 etc/sysctl.conf
 srv/web/ipfire/cgi-bin/ids.cgi

diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd
index de52617a5d8f8d2291bfb70c5094c59d4ee579f7..1c685b44a86f6f1a83dc43b3ace83c8347185e1c 100644 (file)
--- a/src/initscripts/system/collectd
+++ b/src/initscripts/system/collectd
@@ -92,7 +92,7 @@ case "$1" in
                fi
 
                # Enable cpufreq plugin if cpufreq found
-               if [ ! -e  /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_cur_freq ]; then
+               if [ ! -e  /sys/devices/system/cpu/cpufreq/policy0/*_cur_freq ]; then
                        sed -i -e "s|^LoadPlugin cpufreq|#LoadPlugin cpufreq|g" /etc/collectd.conf
                else
                        sed -i -e "s|^#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf