summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Heim <phreak@gentoo.org>2006-10-20 19:21:25 +0000
committerChristian Heim <phreak@gentoo.org>2006-10-20 19:21:25 +0000
commitabd97e512883ffbbbffe1aae5942bedd2c3a688b (patch)
treebde76026a305dd664c485b5cf20773149aee01aa /sys-power
parentStable on Alpha. (diff)
downloadgentoo-2-abd97e512883ffbbbffe1aae5942bedd2c3a688b.tar.gz
gentoo-2-abd97e512883ffbbbffe1aae5942bedd2c3a688b.tar.bz2
gentoo-2-abd97e512883ffbbbffe1aae5942bedd2c3a688b.zip
Fixing the Governor restore on stop(), fixing #152090 (thanks to Daniel Franke). Tuning the conf.d entry a bit.
(Portage version: 2.1.2_pre3-r5)
Diffstat (limited to 'sys-power')
-rw-r--r--sys-power/cpufrequtils/ChangeLog7
-rw-r--r--sys-power/cpufrequtils/files/cpufrequtils-002-conf.d2
-rw-r--r--sys-power/cpufrequtils/files/cpufrequtils-002-init.d4
3 files changed, 9 insertions, 4 deletions
diff --git a/sys-power/cpufrequtils/ChangeLog b/sys-power/cpufrequtils/ChangeLog
index a7df179c1790..d798ce41e9dd 100644
--- a/sys-power/cpufrequtils/ChangeLog
+++ b/sys-power/cpufrequtils/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-power/cpufrequtils
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.29 2006/07/17 06:16:55 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/ChangeLog,v 1.30 2006/10/20 19:21:25 phreak Exp $
+
+ 20 Oct 2006; Christian Heim <phreak@gentoo.org>
+ files/cpufrequtils-002-conf.d, files/cpufrequtils-002-init.d:
+ Fixing the Governor restore on stop(), fixing #152090 (thanks to Daniel
+ Franke). Tuning the conf.d entry a bit.
*cpufrequtils-002-r2 (17 Jul 2006)
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d b/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d
index 5f2d91fedc54..eb24f8de2364 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d
+++ b/sys-power/cpufrequtils/files/cpufrequtils-002-conf.d
@@ -1,6 +1,6 @@
# /etc/conf.d/cpufrequtils: config file for /etc/init.d/cpufrequtils
# Which governor to use. Must be one of the governors listed in:
-# cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors
+# cat /sys/devices/system/cpu/cpu?/cpufreq/scaling_available_governors
#
GOVERNOR="ondemand"
diff --git a/sys-power/cpufrequtils/files/cpufrequtils-002-init.d b/sys-power/cpufrequtils/files/cpufrequtils-002-init.d
index 593370d77300..fcd2ae136520 100644
--- a/sys-power/cpufrequtils/files/cpufrequtils-002-init.d
+++ b/sys-power/cpufrequtils/files/cpufrequtils-002-init.d
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-002-init.d,v 1.3 2006/07/17 06:16:55 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufrequtils/files/cpufrequtils-002-init.d,v 1.4 2006/10/20 19:21:25 phreak Exp $
checkconfig() {
if [ -z "${GOVERNOR}" ]; then
@@ -39,5 +39,5 @@ start() {
stop() {
checkconfig || return 1
- affect_change "Disabling" "${RESTORED_GOVERNOR}"
+ affect_change "Disabling" "${GOVERNOR}"
}