]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
cpufreq initskript activate collectd only if cpufreq is supported now
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Aug 2008 06:36:07 +0000 (08:36 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 3 Aug 2008 06:36:07 +0000 (08:36 +0200)
src/initscripts/init.d/cpufreq

index fb326d7eb0b12809b5a22df5be182eedda9142bb..a316833b726cad4fdccb46b0f494d0b1aa9676f7 100644 (file)
@@ -19,6 +19,7 @@ case "${1}" in
        start)
                boot_mesg -n "Starting cpufreq ... "
 
+               # try cpufreq hardware depend modules
                for module in acpi-cpufreq cpufreq-nforce2 e-powersaver \
                    gx-suspmod longhaul longrun p4-clockmod powernow-k6 \
                    powernow-k7 powernow-k8 speedstep-centrino speedstep-ich \
@@ -29,6 +30,7 @@ case "${1}" in
                    fi
                done
                boot_mesg ""
+
                # load cqufreq governors
                modprobe cpufreq_conservative
                modprobe cpufreq_ondemand
@@ -37,11 +39,13 @@ case "${1}" in
 
                # Set the governor to ondemand 
                cpufreq-set -g ondemand
-               evaluate_retval;
-               
-               # activate cpufreq collectd module
-               sed -i -e "s|#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf
-
+               if [ ${?} = 0 ]; then
+                   # activate cpufreq collectd module
+                   sed -i -e "s|#LoadPlugin cpufreq|LoadPlugin cpufreq|g" /etc/collectd.conf
+                   echo_ok;
+               else
+                   echo_failure;
+               fi
                exit 0;
                ;;
        *)