rpms/cpuspeed/FC-6 cpuspeed.init,1.18,1.19 cpuspeed.spec,1.46,1.47

[fedora-cvs-commits at redhat.com]

Author: jwilson

Update of /cvs/dist/rpms/cpuspeed/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv21341

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
Clean up output a bit, default to ondemand gov in acpi-cpufreq case


Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.init,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- cpuspeed.init	12 Jan 2007 15:50:36 -0000	1.18
+++ cpuspeed.init	22 Feb 2007 23:43:51 -0000	1.19
@@ -23,6 +23,7 @@
 lockfile="/var/lock/subsys/$prog"
 xendir="/proc/xen"
 logger="/usr/bin/logger -p info -t cpuspeed"
+IGNORE_NICE=${IGNORE_NICE:-0}
 module_loaded=false
 
 some_file_exist() {
@@ -87,7 +88,7 @@
 	if [ -n "$MAX_SPEED" ]; then
 	    OPTS="$OPTS -M $MAX_SPEED"
 	fi
-	if [ $IGNORE_NICE -eq 0 ]; then
+	if [ "$IGNORE_NICE" -eq 0 ]; then
 	    OPTS="$OPTS -n"
 	fi
 	daemon cpuspeed -d $OPTS
@@ -96,8 +97,8 @@
 }
 
 stop_cpuspeed() {
-	echo -n $"Stopping $prog: "
 	if [ -n "`pidof cpuspeed`" ]; then
+	    echo -n $"Stopping $prog: "
 	    killproc cpuspeed -USR1
 	    killproc cpuspeed -INT
 	fi
@@ -140,7 +141,7 @@
 		drv=`cat ${cpu0freqd}/scaling_driver`
 
 		case "$drv" in
-		centrino|powernow-k8|p4-clockmod)
+		centrino|powernow-k8|p4-clockmod|acpi-cpufreq)
 			default_governor=ondemand
 			;;
 		*)
@@ -179,7 +180,7 @@
 		        adjust_cpufreq ${governor}/ignore_nice_load $IGNORE_NICE
 		    fi
 		    echo -n "Enabling ${governor} cpu frequency scaling: "
-		    daemon :
+		    success
 		    RETVAL=0
 		fi
 		echo
@@ -212,7 +213,7 @@
 	    if [ $module_loaded == true ]; then
 	        /sbin/modprobe -r cpufreq-${governor}
 	    fi
-	    daemon :
+	    success
 	    RETVAL=0
 	else
 	    stop_cpuspeed
@@ -237,7 +238,7 @@
 	status)
 	    governor_module_loaded && module_loaded=true
 	    if [ -d "$xendir" ]; then
-	        echo "Frequency scaling not support under xen kernels"
+	        echo "Frequency scaling not supported under xen kernels"
 	    elif [ $module_loaded == true -o ${governor} == "performance" ]; then
 	        echo "Frequency scaling enabled using ${governor} governor"
 	    else


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- cpuspeed.spec	12 Jan 2007 16:36:13 -0000	1.46
+++ cpuspeed.spec	22 Feb 2007 23:43:51 -0000	1.47
@@ -85,6 +85,10 @@
 exit 0
 
 %changelog
+* Thu Feb 22 2007 Jarod Wilson <jwilson at redhat.com>
+- Default to ondemand for acpi-cpufreq case
+- Minor initscript output cleanup
+
 * Thu Jan 11 2007 Jarod Wilson <jwilson at redhat.com>
 - Fix error-suppression for systems that report support
   for est, but have it disabled in the bios (#220200)