Update cpufrequency handling - closes issue505

diff --git a/autoconfig.functions b/autoconfig.functions
index 94f786c..1f76476 100755 (executable)
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Klaus Knopper <knopper@knopper.net>, (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mon Jun 09 17:05:42 CEST 2008 [mika]
+# Latest change: Fre Aug 15 23:06:21 CEST 2008 [mika]
 ################################################################################
 
 # {{{ path, variables, signals, umask, zsh
@@ -1242,10 +1242,12 @@ if checkbootparam "nocpu"; then
 else
   # check module dependencies
   cpufreq_check() {
-   if [ -e /lib64 ] ; then
-      [ -e /lib/modules/${KERNEL}/kernel/arch/x86_64/kernel/cpufreq ] || return 1
-   else
-      [ -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] || return 1
+   if ! [ -e /lib/modules/${KERNEL}/kernel/arch/x86/kernel/cpu/cpufreq ] ; then
+      if [ -e /lib64 ] ; then
+         [ -e /lib/modules/${KERNEL}/kernel/arch/x86_64/kernel/cpufreq ] || return 1
+      else
+         [ -e /lib/modules/${KERNEL}/kernel/arch/i386/kernel/cpu/cpufreq -o ! -e /lib/modules/${KERNEL}/kernel/drivers/cpufreq ] || return 1
+      fi
    fi
   }
 

diff --git a/debian/changelog b/debian/changelog
index 69e13c9..22f6b98 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grml-autoconfig (0.8.10) unstable; urgency=low
+
+  * Update cpufrequency handling to reflect changes in current
+    kernel versions (like 2.6.26-grml). The cpufrequency modules
+    are available at $KERNEL/kernel/arch/x86/kernel/cpu/cpufreq
+    due to the x86/amd64 merge.
+    [Closes: issue505]
+
+ -- Michael Prokop <mika@grml.org>  Fri, 15 Aug 2008 23:06:26 +0200
+
 grml-autoconfig (0.8.9) unstable; urgency=low
 
   * Check for /dev/input/mice before starting GPM.