From: Arne Fitzenreiter Date: Tue, 3 Jul 2018 13:07:41 +0000 (+0200) Subject: collect: fix cpufreq graph on some machines. X-Git-Tag: v2.21-core123~75 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=37458540bf727df09989c10d640ad13c1a989029 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 000df8f5f7..bb833fc3a1 100644 --- 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 de52617a5d..1c685b44a8 100644 --- 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