|
|
Author: davej
Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19169
Modified Files:
cpuspeed.init cpuspeed.spec
Log Message:
Merge one more patch from Michal Jaegermann <michal@xxxxxxxxxxxx> (#216816)
Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- cpuspeed.init 20 Nov 2006 21:25:00 -0000 1.15
+++ cpuspeed.init 22 Nov 2006 03:58:14 -0000 1.16
@@ -29,7 +29,6 @@
start() {
if [ ! -f /var/lock/subsys/cpuspeed ] ; then
-
if ! some_file_exist $testpat ; then
# Attempt to load scaling_driver if not loaded
# but it is configured
@@ -84,7 +83,7 @@
stop() {
[ ! -f ${cpu0freqd}/scaling_driver ] && return 0
drv=`cat ${cpu0freqd}/scaling_driver`
-
+
case "$drv" in
centrino|powernow-k8)
/sbin/modprobe -r cpufreq-ondemand
@@ -102,7 +101,7 @@
fi
RETVAL=$?
esac
- /sbin/modprobe -r $drv
+ [ -n "$DRIVER" ] && /sbin/modprobe -r $DRIVER
[ $RETVAL = 0 ] && RETVAL=$?
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/cpuspeed
return $RETVAL
Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cpuspeed.spec 20 Nov 2006 21:25:00 -0000 1.42
+++ cpuspeed.spec 22 Nov 2006 03:58:14 -0000 1.43
@@ -72,6 +72,9 @@
exit 0
%changelog
+* Tue Nov 21 2006 Dave Jones <davej@xxxxxxxxxx>
+- Merge one more patch from Michal Jaegermann <michal@xxxxxxxxxxxx> (#216816)
+
* Mon Nov 20 2006 Dave Jones <davej@xxxxxxxxxx>
- Merge patch from Michal Jaegermann <michal@xxxxxxxxxxxx>
that solves the acpi-cpufreq problem in an improved
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|