rpms/cpuspeed/devel cpuspeed.init, 1.42, 1.43 cpuspeed.spec, 1.75, 1.76

[Jarod Wilson]

Author: jwilson

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Tue Mar 17 2009 Jarod Wilson <jarod at redhat.com> 1.5-6
- Fix up prior fix-up so that status and stop actually do the right thing
  on NON-p4-clockmod systems



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cpuspeed.init	6 Mar 2009 20:09:36 -0000	1.42
+++ cpuspeed.init	17 Mar 2009 15:23:48 -0000	1.43
@@ -225,7 +225,8 @@
 }
 
 stop() {
-  if [ is_p4_clockmod ]; then
+  is_p4_clockmod && p4status="true"
+  if [ "$p4status" == "true" ]; then
     echo "p4-clockmod passive cooling support cannot be stopped"
     return 0
   fi
@@ -266,7 +267,8 @@
     ;;
 
   status)
-    if [ is_p4_clockmod ]; then
+    is_p4_clockmod && p4status="true"
+    if [ "$p4status" == "true" ]; 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.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- cpuspeed.spec	6 Mar 2009 20:09:36 -0000	1.75
+++ cpuspeed.spec	17 Mar 2009 15:23:48 -0000	1.76
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.5
-Release:        5%{?dist}
+Release:        6%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPLv2+
@@ -81,6 +81,10 @@
 exit 0
 
 %changelog
+* Tue Mar 17 2009 Jarod Wilson <jarod at redhat.com> 1.5-6
+- Fix up prior fix-up so that status and stop actually do the right thing
+  on NON-p4-clockmod systems
+
 * Fri Mar 06 2009 Jarod Wilson <jarod at redhat.com> 1.5-5
 - Fix up p4-clockmod support so start/stop/status actually report
   something sane to the user