Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / cpufreq

diff --git a/src/initscripts/init.d/cpufreq b/src/initscripts/init.d/cpufreq
index a4540578318b954395f6d60548f19ed1aa9c0885..4704b535a4709b060fd5b6b981fd7a5e57781a29 100644 (file)
--- a/src/initscripts/init.d/cpufreq
+++ b/src/initscripts/init.d/cpufreq
@@ -37,11 +37,19 @@ case "${1}" in
                modprobe cpufreq_powersave
                modprobe cpufreq_userspace
 
-               # Set the governor to ondemand 
+               CPUCOUNT=`ls /sys/devices/system/cpu/cpu*/cpufreq/affected_cpus | wc -l`;
+               let CPUCOUNT-=1
+               # 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
+                   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
+                       cpufreq-set -c $i -g ondemand
+                   done
                    echo_ok;
                else
                    echo_failure;