From: Grazvydas Ignotas Date: Mon, 25 Jun 2012 21:08:14 +0000 (+0300) Subject: op_cpuspeed.sh: allow to disable 'stupid' quistions X-Git-Tag: sz_152~61 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=commitdiff_plain;h=0ec4925f6a528a18df2ef65b83b5c63cb601023c;hp=bbe3505488ec29c984eb1f7affb0e6ea34820746 op_cpuspeed.sh: allow to disable 'stupid' quistions we need to disable this on boot, or else it will ask questions and hang the boot process. Also check for valid values to not write trash to cpu_mhz_max --- diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index ae8f66b..076020c 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" DEPENDS = "zenity dbus" RDEPENDS = "zenity dbus" -PR = "r100" +PR = "r101" SRC_URI = " \ file://op_paths.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh index 39855dc..e1eeeb7 100755 --- a/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh +++ b/recipes/pandora-system/pandora-scripts/op_cpuspeed.sh @@ -7,7 +7,11 @@ warn="$(cat /etc/pandora/conf/cpu.conf | grep 'warn:' | awk -F\: '{print $2}')" device=/proc/pandora/cpu_mhz_max curmhz="$(cat $device)" newmhz="$(cat $device)" -kernel_major=`uname -r | cut -c 1` + +if [ "$1" = "-n" ]; then + shift + warn=no +fi if [ ! -e $device ]; then if [ -z "$1" -a -n "$DISPLAY" ]; then @@ -21,12 +25,17 @@ if [ ! $1 ]; then if [ $DISPLAY ]; then newmhz=$(zenity --scale --text "Set CPU clockspeed" --min-value=$minmhz --max-value=$maxmhz --value=$curmhz --step 1) else - newmhz=$(read -p "Please enter the desired clockspeed") + read -p "Please enter the desired clockspeed: " newmhz fi else newmhz=$1 fi +if ! [ 0 -lt "$newmhz" -a "$newmhz" -lt 10000 ]; then + echo "invalid argument: $newmhz" + exit 1 +fi + if [ $newmhz ]; then if [ $newmhz -gt $safemhz ]; then if [ $warn != no ]; then