From 6cc7c2a3d0f000f37f57bdb76cdd156c08b07c6d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 30 May 2018 11:30:01 +0200 Subject: [PATCH] collectd: move cpufreq plugin init because arm has no cpufrequtils Signed-off-by: Arne Fitzenreiter --- lfs/cpufrequtils | 4 ++-- src/initscripts/packages/cpufreq | 5 ----- src/initscripts/system/collectd | 7 +++++++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lfs/cpufrequtils b/lfs/cpufrequtils index d558efa612..54d9347ef5 100644 --- a/lfs/cpufrequtils +++ b/lfs/cpufrequtils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2015 IPFire Team # +# Copyright (C) 2007-2018 IPFire Team # # # # 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 6a89414b2d..a295c2eb22 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 761e9c3f86..cf5b897e39 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 -- 2.39.2