op_cpu*: check for overclocking /proc entry, not kernel version

[openpandora.oe.git] / recipes / pandora-system / pandora-scripts / op_cpuspeed.sh

diff --git a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
index 2aae2d2..965cb0a 100755 (executable)
--- a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
+++ b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh
@@ -4,15 +4,18 @@ minmhz="$(cat /etc/pandora/conf/cpu.conf | grep 'min:' | awk -F\: '{print $2}')"
 safemhz="$(cat /etc/pandora/conf/cpu.conf | grep 'safe:' | awk -F\: '{print $2}')"
 maxmhz="$(cat /etc/pandora/conf/cpu.conf | grep 'max:' | awk -F\: '{print $2}')"
 warn="$(cat /etc/pandora/conf/cpu.conf | grep 'warn:' | awk -F\: '{print $2}')"
-curmhz="$(cat /proc/pandora/cpu_mhz_max)"
-newmhz="$(cat /proc/pandora/cpu_mhz_max)"
 device=/proc/pandora/cpu_mhz_max
+curmhz="$(cat $device)"
+newmhz="$(cat $device)"
 kernel_major=`uname -r | cut -c 1`
 
-if [ "$kernel_major" = "3" ]; then
-    zenity --info --title="CPU-Settings not supported" --text "Sorry, the experimental kernel does not support setting the clockspeed (yet)."
+if [ ! -e $device ]; then
+    if [ -z "$1" -a -n "$DISPLAY" ]; then
+        zenity --info --title="CPU-Settings not supported" --text \
+            "Sorry, the experimental kernel does not support setting the clockspeed (yet)."
+    fi
     exit 1
-else
+fi
 
 if [ ! $1 ]; then
        if [ $DISPLAY ]; then
@@ -21,8 +24,9 @@ if [ ! $1 ]; then
                newmhz=$(read -p "Please enter the desired clockspeed")
        fi
 else
-newmhz=$1
+       newmhz=$1
 fi
+
 if [ $newmhz ]; then
         if [ $newmhz -gt $safemhz ]; then
                if [ $warn != no ]; then 
@@ -41,6 +45,5 @@ if [ $newmhz ]; then
         if [ $newmhz -le $minmhz ]; then newmhz=$minmhz; fi
         if [ $newmhz -ge $maxmhz ]; then newmhz=$maxmhz; fi
        echo $newmhz > $device
-       echo cpu_mhz_max set to $(cat /proc/pandora/cpu_mhz_max)
+       echo cpu_mhz_max set to $(cat $device)
 fi
-fi
\ No newline at end of file