rpms/cpuspeed/devel cpuspeed.init, 1.46, 1.47 cpuspeed.spec, 1.79, 1.80

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17559

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Fri Jun 26 2009 Jarod Wilson <jarod at redhat.com> 1.5-10
- Fix #505837 for real this time, even tested on an actual
  p4-clockmod system, seems to DTRT



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- cpuspeed.init	22 Jun 2009 12:26:52 -0000	1.46
+++ cpuspeed.init	26 Jun 2009 16:33:17 -0000	1.47
@@ -26,7 +26,6 @@
 . /etc/rc.d/init.d/functions
 
 prog="cpuspeed"
-GOVERNOR=""
 
 [ -f /usr/sbin/$prog ] || exit 5
 
@@ -163,17 +162,11 @@ start() {
         # and then next test will bail out.
         [ -d ${cpu0freqd} ] || /sbin/modprobe -r acpi-cpufreq 2> /dev/null
       fi
-      if [ ! -d ${cpu0freqd} -a "$cpu_vendor" == GenuineIntel -a "0${GOVERNOR}" -ne 0 ]; then
+      if [ ! -d ${cpu0freqd} -a "$cpu_vendor" == GenuineIntel ]; then
         # last-ditch effort for Intel proc boxes, try our neutered p4-clockmod
         # to get at least passive cooling support (no clock changes)
         /sbin/modprobe p4-clockmod 2> /dev/null
-        if [ -d ${cpu0freqd} ]; then
-          echo -n "Enabling p4-clockmod driver (passive cooling only): "
-          success; echo
-          return 0
-        else
-          /sbin/modprobe -r p4-clockmod 2> /dev/null
-        fi
+        [ -d ${cpu0freqd} ] || /sbin/modprobe -r p4-clockmod 2> /dev/null
       fi
     fi
 
@@ -189,12 +182,23 @@ start() {
       centrino|powernow-k8|acpi-cpufreq|e_powersaver)
         default_governor=ondemand
         ;;
+      p4-clockmod)
+        # not actually a governor, we want to bail without doing either
+	# in-kernel scaling or starting up the cpuspeed daemon in this case
+        default_governor=p4passive
+        ;;
       *)
         default_governor=userspace
         ;;
     esac
     governor=${GOVERNOR:-${default_governor}}
 
+    if [ "${governor}" == "p4passive" ]; then
+      echo -n "Enabling p4-clockmod driver (passive cooling only): "
+      success; echo
+      return 0
+    fi
+
     # Load governor module, if need be, and validate
     governor_is_module && /sbin/modprobe cpufreq-${governor}
     if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ]; then
@@ -254,7 +258,7 @@ stop() {
     return 4
   fi
   is_p4_clockmod && p4status="true"
-  if [ "$p4status" == "true" ]; then
+  if [ "$p4status" == "true" -a "x${GOVERNOR}" == "x" ]; then
     echo "p4-clockmod passive cooling support cannot be stopped"
     return 0
   fi
@@ -296,7 +300,7 @@ case "$1" in
 
   status)
     is_p4_clockmod && p4status="true"
-    if [ "$p4status" == "true" ]; then
+    if [ "$p4status" == "true" -a "x${GOVERNOR}" == "x" ]; then
       echo "p4-clockmod passive cooling is enabled"
       exit 0
     fi


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- cpuspeed.spec	22 Jun 2009 12:26:52 -0000	1.79
+++ cpuspeed.spec	26 Jun 2009 16:33:17 -0000	1.80
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@ fi
 exit 0
 
 %changelog
+* Fri Jun 26 2009 Jarod Wilson <jarod at redhat.com> 1.5-10
+- Fix #505837 for real this time, even tested on an actual
+  p4-clockmod system, seems to DTRT
+
 * Mon Jun 22 2009 Jarod Wilson <jarod at redhat.com> 1.5-9
 - Un-pooch fix for #505837 (caused #507216 and didn't work right
   to begin with...)