From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 37458540bf727df09989c10d640ad13c1a989029
Date: Tue, 03 Jul 2018 14:13:11 +0100 [thread overview]
Message-ID: <20180703131311.70FF91081BA5@git01.ipfire.org> (raw)
[-- 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
reply other threads:[~2018-07-03 13:13 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180703131311.70FF91081BA5@git01.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox