Fixing the Governor restore on stop(), fixing #152090 (thanks to Daniel Franke). Tuning the conf.d entry a bit.

Package-Manager: portage-2.1.2_pre3-r5

4 files changed, 25 insertions, 20 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/Manifest b/sys-power/cpufrequtils/Manifest
index adf786a866d8..a4fa58039745 100644
--- a/sys-power/cpufrequtils/Manifest
+++ b/sys-power/cpufrequtils/Manifest
@@ -9,14 +9,14 @@ AUX cpufrequtils-001-init.d 496 RMD160 96232df687117b34cb1a724e5202173b551bc7b2
 MD5 b68d94133a48be4c8c9d274a4941b3ae files/cpufrequtils-001-init.d 496
 RMD160 96232df687117b34cb1a724e5202173b551bc7b2 files/cpufrequtils-001-init.d 496
 SHA256 9a7d2c980bb9d2d3d9c6956152e32bcd5143cfc2755eb9a078bc147695e2d0e0 files/cpufrequtils-001-init.d 496
-AUX cpufrequtils-002-conf.d 230 RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 SHA1 f6abbf64b28c76ffd6eff94830c993240518aa4a SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818
-MD5 ff862256db38dcc1f5d3a5f86f29edb2 files/cpufrequtils-002-conf.d 230
-RMD160 978c0a1f841e2a00b295f4165b392a2a554832c3 files/cpufrequtils-002-conf.d 230
-SHA256 e63c7285432551b5a1c58a1ff0f2d54f1202a614004c5f97ba93cefc0605d818 files/cpufrequtils-002-conf.d 230
-AUX cpufrequtils-002-init.d 952 RMD160 a663ff9d6eaf8dcea958bfbe1a71618b7e7da1e7 SHA1 694ae232381a36ee98c284bebad0e54e6d8a1b59 SHA256 5a06b92ece4be642c8a29ac352de8eb761ae092fd20b33a026c6d46051f90f29
-MD5 a9bcf0b00c769a4f57141ef4aa2f7a30 files/cpufrequtils-002-init.d 952
-RMD160 a663ff9d6eaf8dcea958bfbe1a71618b7e7da1e7 files/cpufrequtils-002-init.d 952
-SHA256 5a06b92ece4be642c8a29ac352de8eb761ae092fd20b33a026c6d46051f90f29 files/cpufrequtils-002-init.d 952
+AUX cpufrequtils-002-conf.d 230 RMD160 999fc00d4a23749616da7ea4384661f7d55bb6e8 SHA1 2074439ec46d327b1d76e7f2cdc0ed7650fcf6da SHA256 943c4eaf5f25fb4f70cd9b8174729266110ca729fb5be8fc0f89e992dd73feff
+MD5 6c70415e4039ec2dd91c5d5d6dc73783 files/cpufrequtils-002-conf.d 230
+RMD160 999fc00d4a23749616da7ea4384661f7d55bb6e8 files/cpufrequtils-002-conf.d 230
+SHA256 943c4eaf5f25fb4f70cd9b8174729266110ca729fb5be8fc0f89e992dd73feff files/cpufrequtils-002-conf.d 230
+AUX cpufrequtils-002-init.d 943 RMD160 d77710bffe597be6be533596bc381687d9176e47 SHA1 f9ea3dca400ed89520c20204f2b6d8f5a1930876 SHA256 3bb39b80d3557ce06f293de91293650799c3f1f6581a393d81e571e44601675e
+MD5 38b163f795d75bc34b61dd1a9b14b587 files/cpufrequtils-002-init.d 943
+RMD160 d77710bffe597be6be533596bc381687d9176e47 files/cpufrequtils-002-init.d 943
+SHA256 3bb39b80d3557ce06f293de91293650799c3f1f6581a393d81e571e44601675e files/cpufrequtils-002-init.d 943
 AUX cpufrequtils-002-parallel-make.patch 580 RMD160 c521c04cf137bd72800f37922b548bfd3464a56e SHA1 c778e3e28ea16f3bd339f5fc2e1e3587936b4618 SHA256 13dea5e075f883bdbf81fb16054c68f2e99e5df89e4d1191e19cd5094a4909dc
 MD5 ec29a9a54ad27491e0e26ef277c13441 files/cpufrequtils-002-parallel-make.patch 580
 RMD160 c521c04cf137bd72800f37922b548bfd3464a56e files/cpufrequtils-002-parallel-make.patch 580
@@ -31,10 +31,10 @@ EBUILD cpufrequtils-002-r2.ebuild 1223 RMD160 42592314eb39e13193c07dcde8b142bdb9
 MD5 c1ac4b518822b6f8471267b1f370c956 cpufrequtils-002-r2.ebuild 1223
 RMD160 42592314eb39e13193c07dcde8b142bdb92ee983 cpufrequtils-002-r2.ebuild 1223
 SHA256 f844d5f4479ccfbd12f201447ed5b672b557dc858f94c910219607cd167348a1 cpufrequtils-002-r2.ebuild 1223
-MISC ChangeLog 4959 RMD160 dc747e62c377eef59c6dfb170b469e791447b2a9 SHA1 55bf567a61ff849d640f639ea6d4bc4fa04705d3 SHA256 31270f434e2f260970cec199cfd43b6b510fef6c8d736ea72501a3a2fd28810e
-MD5 7c14b56cce83daae07e6dc6fe42c6ed3 ChangeLog 4959
-RMD160 dc747e62c377eef59c6dfb170b469e791447b2a9 ChangeLog 4959
-SHA256 31270f434e2f260970cec199cfd43b6b510fef6c8d736ea72501a3a2fd28810e ChangeLog 4959
+MISC ChangeLog 5190 RMD160 ad44f04a38cf22eaa4c81e26f8b946c4e0b90191 SHA1 1c866938dcef1adc19c899feb33bf85b8520bd7b SHA256 94a63bb31c60e314ff4699ae5ec14d4075b48a9551514e2f5731a52257b8b36a
+MD5 0b76e4fe04fbf359841a378db2254d3d ChangeLog 5190
+RMD160 ad44f04a38cf22eaa4c81e26f8b946c4e0b90191 ChangeLog 5190
+SHA256 94a63bb31c60e314ff4699ae5ec14d4075b48a9551514e2f5731a52257b8b36a ChangeLog 5190
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
@@ -46,9 +46,9 @@ MD5 17ef7af58940064e9e54cb9d2f553930 files/digest-cpufrequtils-002-r2 250
 RMD160 bdd97198411affcfe84253cd95f2b18c9008653e files/digest-cpufrequtils-002-r2 250
 SHA256 1739d5a4258b6f01934448fdf0f04915d43976bd1560cd519c83de9d83226cdb files/digest-cpufrequtils-002-r2 250
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFEuytpflZ8QqxhrsMRAiLcAKDIvzl0VstvWCPe1N2HQ85Qj/26vACffYz8
-JBWnqj1xWjYkNcDLJqukQSc=
-=1sVg
+iD8DBQFFOSG9yuNVb5qfaOYRAsvCAJ9Csqnu0ooek/j8XMqiddK4MwFWOwCeLE93
+JDAnu1ahSmCWGjQxHoqAUEU=
+=wwnp
 -----END PGP SIGNATURE-----
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}"
 }