rpms/cpuspeed/FC-4 cpuspeed.init,1.2,1.3 cpuspeed.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
backport devel/ bits.




Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-4/cpuspeed.init,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cpuspeed.init	24 Sep 2005 00:05:46 -0000	1.2
+++ cpuspeed.init	23 Dec 2005 07:42:04 -0000	1.3
@@ -24,8 +24,12 @@
 				/sbin/modprobe "$DRIVER"
 			else
 				# use ACPI as a fallback if its available.
-				if [ -f /proc/acpi/processor/CPU0/info ]; then
-					/sbin/modprobe acpi-cpufreq
+				if [ -f /proc/acpi/processor/CPU0/throttling ]; then
+					# Check we have throttling states available.
+					thr=`head -n1 /proc/acpi/processor/CPU0/throttling`
+					if [ "$thr" != "<not supported>" ]; then
+						/sbin/modprobe acpi-cpufreq
+					fi
 				fi
 			fi
 		fi
@@ -48,8 +52,8 @@
 stop() {
 	if test "x`pidof cpuspeed`" != x; then
 		echo -n $"Stopping $prog: "
+		killproc cpuspeed -USR1
 		killproc cpuspeed -INT
-		sleep 1
 		echo
 	fi
 	if test "x`pidof cpuspeed`" != x; then


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-4/cpuspeed.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cpuspeed.spec	24 Sep 2005 00:06:19 -0000	1.23
+++ cpuspeed.spec	23 Dec 2005 07:42:04 -0000	1.24
@@ -72,6 +72,10 @@
 exit 0
 
 %changelog
+* Fri Dec 23 2005 Dave Jones <davej at redhat.com>
+- Reset speed to max on deamon exit.
+- Don't load acpi-cpufreq if no throttling states exist.
+
 * Fri Sep 23 2005 Dave Jones <davej at redhat.com>
 - Use ACPI as a fallback driver if none is set, and its available. (#160788)