rpms/cpuspeed/devel cpuspeed.init, 1.44, 1.45 cpuspeed.spec, 1.77, 1.78

[Jarod Wilson]

Author: jwilson

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

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



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- cpuspeed.init	10 Jun 2009 21:07:31 -0000	1.44
+++ cpuspeed.init	17 Jun 2009 20:39:19 -0000	1.45
@@ -166,7 +166,7 @@ start() {
         # 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
+        if [ -d ${cpu0freqd} -a -n ${GOVERNOR} ]; then
           echo -n "Enabling p4-clockmod driver (passive cooling only): "
           success; echo
           return 0


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- cpuspeed.spec	10 Jun 2009 21:07:31 -0000	1.77
+++ cpuspeed.spec	17 Jun 2009 20:39:19 -0000	1.78
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@ fi
 exit 0
 
 %changelog
+* 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)
+
 * Wed Jun 10 2009 Jarod Wilson <jarod at redhat.com> 1.5-7
 - Fix up lsb compliance a bit (#246895)
 - Correct a few more exit codes (rhel5 bz, #495049)