rpms/cpuspeed/F-11 cpuspeed.init,1.44,1.45 cpuspeed.spec,1.77,1.78

[Jarod Wilson]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7248

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* 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...)



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-11/cpuspeed.init,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- cpuspeed.init	17 Jun 2009 21:00:06 -0000	1.44
+++ cpuspeed.init	22 Jun 2009 12:47:28 -0000	1.45
@@ -26,6 +26,7 @@
 . /etc/rc.d/init.d/functions
 
 prog="cpuspeed"
+GOVERNOR=""
 
 [ -f /usr/sbin/$prog ] || exit 5
 
@@ -162,11 +163,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 ]; then
+      if [ ! -d ${cpu0freqd} -a "$cpu_vendor" == GenuineIntel -a "0${GOVERNOR}" -ne 0 ]; 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} -a -n ${GOVERNOR} ]; then
+        if [ -d ${cpu0freqd} ]; then
           echo -n "Enabling p4-clockmod driver (passive cooling only): "
           success; echo
           return 0


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/F-11/cpuspeed.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- cpuspeed.spec	17 Jun 2009 21:00:06 -0000	1.77
+++ cpuspeed.spec	22 Jun 2009 12:47:28 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@ fi
 exit 0
 
 %changelog
+* 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...)
+
 * Wed Jun 17 2009 Jarod Wilson <jarod at redhat.com> 1.5-8
 - Let p4-clockmod users override defaults and set a governor,
   even if its generally a Bad Idea... (#505837)