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 2027c75ff34b504aaf220a21f92153261fcfc182 (commit) via 6cc7c2a3d0f000f37f57bdb76cdd156c08b07c6d (commit) from 87b5f3711ba2e166a61fd521f7819f20e7f9eb14 (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 2027c75ff34b504aaf220a21f92153261fcfc182 Merge: 6cc7c2a3d 87b5f3711 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu May 31 07:01:55 2018 +0200
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 6cc7c2a3d0f000f37f57bdb76cdd156c08b07c6d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Wed May 30 11:30:01 2018 +0200
collectd: move cpufreq plugin init because arm has no cpufrequtils
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/cpufrequtils | 4 ++-- src/initscripts/packages/cpufreq | 5 ----- src/initscripts/system/collectd | 7 +++++++ 3 files changed, 9 insertions(+), 7 deletions(-)
Difference in files: diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index d558efa61..54d9347ef 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@
include Config
-VER = 008 +VER = 009
THISAPP = cpufrequtils-$(VER) DL_FILE = $(THISAPP).tar.bz2 diff --git a/src/initscripts/packages/cpufreq b/src/initscripts/packages/cpufreq index 6a89414b2..a295c2eb2 100644 --- a/src/initscripts/packages/cpufreq +++ b/src/initscripts/packages/cpufreq @@ -41,8 +41,6 @@ case "${1}" in case "$driver" in intel_pstate) # pstate use internal gov so skip this setting - # activate cpufreq collectd module - sed -i -e "s|^#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf echo_ok; ;; *) @@ -51,9 +49,6 @@ case "${1}" in # Set the governor to ondemand to test if it works cpufreq-set -g ondemand if [ ${?} = 0 ]; then - # activate cpufreq collectd module - sed -i -e "s|^#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf - # Set the governor to ondemand for all cpus for i in `seq 0 $CPUCOUNT`; do diff --git a/src/initscripts/system/collectd b/src/initscripts/system/collectd index 761e9c3f8..cf5b897e3 100644 --- a/src/initscripts/system/collectd +++ b/src/initscripts/system/collectd @@ -88,6 +88,13 @@ case "$1" in sed -i -e 's|^#include "/etc/collectd.thermal"$|include "/etc/collectd.thermal"|g' /etc/collectd.conf fi
+ # Enable cpufreq plugin if cpufreq found + if [ ! -e /sys/devices/system/cpu/cpufreq/policy0/cpuinfo_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 + fi + # Enable swap plugin if swap found if [ "$(swapon -s | wc -l)" == "0" ]; then sed -i -e "s|^LoadPlugin swap|#LoadPlugin swap|g" /etc/collectd.conf
hooks/post-receive -- IPFire 2.x development tree