rpms/cpuspeed/devel cpuspeed.init, 1.12, 1.13 cpuspeed.spec, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
- Don't try to load acpi-cpufreq on non-ACPI machines. (#196446)



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- cpuspeed.init	26 Jul 2006 04:09:51 -0000	1.12
+++ cpuspeed.init	29 Jul 2006 06:59:15 -0000	1.13
@@ -27,8 +27,13 @@
 			if [ -n "$DRIVER" ]; then
 				/sbin/modprobe "$DRIVER"
 			else
-				# use ACPI as a fallback
-				/sbin/modprobe acpi-cpufreq
+				if [ -d /proc/acpi ]; then
+					# use ACPI as a fallback
+					/sbin/modprobe acpi-cpufreq
+				else
+					# This is a no-ACPI machine. Just exit.
+					return 0
+				fi
 			fi
 		done
 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cpuspeed.spec	26 Jul 2006 04:09:51 -0000	1.39
+++ cpuspeed.spec	29 Jul 2006 06:59:15 -0000	1.40
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Sat Jul 29 2006 Dave Jones <davej at redhat.com>
+- Don't try to load acpi-cpufreq on non-ACPI machines. (#196446)
+
 * Wed Jul 26 2006 Dave Jones <davej at redhat.com>
 - Fix up retval & /var/lock/subsys/cpuspeed handling in initscript.