[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 37458540bf727df09989c10d640ad13c1a989029

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 37458540bf727df09989c10d640ad13c1a989029

[git]

[-- Attachment #1: Type: text/plain, Size: 2281 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  37458540bf727df09989c10d640ad13c1a989029 (commit)
      from  64252706ce374e0253c0d0e274bf2606043d954e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37458540bf727df09989c10d640ad13c1a989029
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jul 3 15:07:41 2018 +0200

    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

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/123/filelists/files | 1 +
 src/initscripts/system/collectd           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/123/filelists/files b/config/rootfiles/core/123/filelists/files
index 000df8f5f..bb833fc3a 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 de52617a5..1c685b44a 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


hooks/post-receive
--
IPFire 2.x development tree