Fixed the init script to start if at least one cpu supports freq scaling.

Package-Manager: portage-2.1.2_pre3-r7

3 files changed, 20 insertions, 19 deletions

diff --git a/sys-power/cpufreqd/ChangeLog b/sys-power/cpufreqd/ChangeLog
index 8aa71c217d6a..8fb93a976832 100644
--- a/sys-power/cpufreqd/ChangeLog
+++ b/sys-power/cpufreqd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-power/cpufreqd
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.40 2006/10/22 08:24:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/ChangeLog,v 1.41 2006/10/24 12:39:53 peper Exp $
+
+  24 Oct 2006; Piotr Jaroszyński <peper@gentoo.org>
+  files/cpufreqd-2.2.0-init.d:
+  Fixed the init script to start if at least one cpu supports freq scaling.
 
 *cpufreqd-2.2.0-r2 (22 Oct 2006)
 
diff --git a/sys-power/cpufreqd/Manifest b/sys-power/cpufreqd/Manifest
index c4ede7ea69a1..90b829a5352e 100644
--- a/sys-power/cpufreqd/Manifest
+++ b/sys-power/cpufreqd/Manifest
@@ -10,10 +10,10 @@ AUX cpufreqd-2.1.1-init.d 914 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 SH
 MD5 ca0fa6db77839fe6855623217979b547 files/cpufreqd-2.1.1-init.d 914
 RMD160 a0edb5d6151a14bc91b427912a88c888f4ac4b91 files/cpufreqd-2.1.1-init.d 914
 SHA256 bb7dc7bebaf3b8adb942903f78624836dd93d7c8a34764767a5c0d5a30fa53e5 files/cpufreqd-2.1.1-init.d 914
-AUX cpufreqd-2.2.0-init.d 1105 RMD160 2b0625409385e298f224d3da02954c1e4e217a25 SHA1 13f8c00ed932031384ed1b62fdc85e3ce707d0e2 SHA256 6c307886a17286a395df1ca8b8d1c046a9c1aea950ea9663af9c66b6a131af7f
-MD5 ba457e9ea6936713919d72a2376eab5c files/cpufreqd-2.2.0-init.d 1105
-RMD160 2b0625409385e298f224d3da02954c1e4e217a25 files/cpufreqd-2.2.0-init.d 1105
-SHA256 6c307886a17286a395df1ca8b8d1c046a9c1aea950ea9663af9c66b6a131af7f files/cpufreqd-2.2.0-init.d 1105
+AUX cpufreqd-2.2.0-init.d 1133 RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 SHA1 cccf1858c0a00c81094b823f6a0f03f402f3e094 SHA256 c42a5fccdda0e030ad9215516236c9cb2024a3970bfa6bca7a85aa10ae863133
+MD5 9a07728d8a95118f743f7ce56c3dc02d files/cpufreqd-2.2.0-init.d 1133
+RMD160 a97f2c05599041a40828995b0b0058dcf2986ae9 files/cpufreqd-2.2.0-init.d 1133
+SHA256 c42a5fccdda0e030ad9215516236c9cb2024a3970bfa6bca7a85aa10ae863133 files/cpufreqd-2.2.0-init.d 1133
 AUX nvclock0.8b-fd.patch 580 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 SHA1 afd021a0144b6adb4dbb936f1a8181db609592fc SHA256 5dad49a3ce2a52b37c4711c497a46c373282bdf27b9b28834a0b5bd977066bf2
 MD5 786c62ca107cb9bc4e67e4cc2af34409 files/nvclock0.8b-fd.patch 580
 RMD160 a5db5cb4f0c0f3270e3f042b1033defd6c406376 files/nvclock0.8b-fd.patch 580
@@ -52,10 +52,10 @@ EBUILD cpufreqd-2.2.0-r2.ebuild 1880 RMD160 a4ea5996f45759439b9b664abb03e4a6f898
 MD5 5e92b3fb1708a86b229992ce82d11a99 cpufreqd-2.2.0-r2.ebuild 1880
 RMD160 a4ea5996f45759439b9b664abb03e4a6f8988858 cpufreqd-2.2.0-r2.ebuild 1880
 SHA256 db0380c85d141703194230201ef08454a729a658f6e5cd78abe9ef9bee767c98 cpufreqd-2.2.0-r2.ebuild 1880
-MISC ChangeLog 9808 RMD160 2c72169d2cf3e511810c3126ae47cdd9fec3b2e8 SHA1 85bb8da4e17480665b1ef990738e75f8ea098ccb SHA256 271e1cccbe19f0a85731011534cc0d4c9822b9dfc0fe953775eb6a0553dbc1fb
-MD5 f9dd2415aab9602c2d186c76b08aa127 ChangeLog 9808
-RMD160 2c72169d2cf3e511810c3126ae47cdd9fec3b2e8 ChangeLog 9808
-SHA256 271e1cccbe19f0a85731011534cc0d4c9822b9dfc0fe953775eb6a0553dbc1fb ChangeLog 9808
+MISC ChangeLog 9968 RMD160 f9c22a79e277d94c4e3e34dae9deee5f306ec401 SHA1 e0dfad4abd27548797f819e1d3c5e552ed629a71 SHA256 818b5621e46120118a52f4115f8042399fbff8ad52091a8acaf31d57ecbdcaf2
+MD5 cca4038293c6749dbc514a882db47138 ChangeLog 9968
+RMD160 f9c22a79e277d94c4e3e34dae9deee5f306ec401 ChangeLog 9968
+SHA256 818b5621e46120118a52f4115f8042399fbff8ad52091a8acaf31d57ecbdcaf2 ChangeLog 9968
 MISC metadata.xml 254 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f SHA1 653c702fdb89577e9d15e9cbca3891e4acdba061 SHA256 9bffc4ff1cf574848699e33b09ff0f6137d6b64b69d82c7b95cafb32ee75becb
 MD5 f3e68295a919220f58e91a1d3468c851 metadata.xml 254
 RMD160 2e69b345a5604844f1c5a8256ea172c7a3cc485f metadata.xml 254
diff --git a/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d b/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d
index 54d5943bb1a3..69ff24f9f288 100644
--- a/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d
+++ b/sys-power/cpufreqd/files/cpufreqd-2.2.0-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/cpufreqd/files/cpufreqd-2.2.0-init.d,v 1.4 2006/10/22 23:14:03 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-power/cpufreqd/files/cpufreqd-2.2.0-init.d,v 1.5 2006/10/24 12:39:53 peper Exp $
 
 CONFIGFILE=/etc/cpufreqd.conf
 
@@ -16,17 +16,14 @@ checkconfig() {
 		return 1
 	fi
 
-	if [ ! -e /proc/cpufreq ] ; then
+	if [[ ! -e /proc/cpufreq ]] ; then
 		for cpu in /sys/devices/system/cpu/cpu[0-9]* ; do
-			n=${cpu##*/}
-			n=${n/cpu/}
-
-			if [ ! -e /sys/devices/system/cpu/cpu${n}/cpufreq ] ; then
-				eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
-				eerror "Make sure that the appropiate drivers for your CPU are available."
-				return 1
-			fi
+                        # We need just one cpu supporting freq scaling.
+                        [[ -e ${cpu}/cpufreq ]] && return 0
 		done
+		eerror "cpufreqd requires the kernel to be configured with CONFIG_CPU_FREQ"
+		eerror "Make sure that the appropiate drivers for your CPU are available."
+		return 1
 	fi
 }