webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

collectd: move cpufreq plugin init because arm has no cpufrequtils

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2018-05-30 11:30:01 +02:00
parent 5e1f3a9cbc
commit 6cc7c2a3d0
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lfs/cpufrequtils
View File

@@ -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

5
src/initscripts/packages/cpufreq
View File

@@ -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

7
src/initscripts/system/collectd
View File

@@ -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