.xinitrc: Added Pandora-Type recognition to determine safe speed after a crash happened

[openpandora.oe.git] / recipes / pandora-system / pandora-skel / .xinitrc

diff --git a/recipes/pandora-system/pandora-skel/.xinitrc b/recipes/pandora-system/pandora-skel/.xinitrc
index 5fb625a..cebf5af 100644 (file)
--- a/recipes/pandora-system/pandora-skel/.xinitrc
+++ b/recipes/pandora-system/pandora-skel/.xinitrc
@@ -85,14 +85,24 @@ chmod +x /tmp/gui.stop
 # This way, we can easily do a quick switch from any session to the next one by simply
 # echo'ing the new session executable into /tmp/gui.load and exiting.    
 
-if [ -f /tmp/nocleanwarn ]; then
+nocleanwarn=$(cat /tmp/nocleanwarn)
+
+if [ $nocleanwarn = "Yes" ]; then
+
+  pnd_version=$(dmesg | grep OMAP3 | grep ES | awk '{print $3}')
+  if [ "$pnd_version" == "OMAP3630" ]; then
+      safespeed="1000"
+  else
+      safespeed="600"
+  fi
+
     defmhz="$(cat /etc/pandora/conf/cpu.conf | grep default | awk -F\: '{print $2}')"
-      if [ $defmhz -gt 600 ]; then
-         if zenity --question --title="Unclean Shutdown" --text="Warning!\n\nThe system has not been shutdown properly last time.\n\nAs you overclocked the CPU as default speed, this might be the reason for that.\nTherefore CPU speed has been currently set to 500 MHz.\n\nShould it be set to your default speed ($defmhz MHz) or shall we keep the 500 MHz for this session?" --ok-label="Set it to $defmhz MHz" --cancel-label="Keep 500MHz"; then
+      if [ $defmhz -gt $safespeed ]; then
+         if zenity --question --title="Unclean Shutdown" --text="Warning!\n\nThe system has not been shutdown properly last time.\n\nAs you overclocked the CPU as default speed, this might be the reason for that.\nTherefore CPU speed has been currently set to the standard CPU speed of your SoC.\n\nShould it be set to your default speed ($defmhz MHz) or shall we keep safe setting for this session?" --ok-label="Set it to $defmhz MHz" --cancel-label="Leave it safe..."; then
            sudo /usr/pandora/scripts/op_cpuspeed.sh $defmhz
          fi
       fi
-  rm /tmp/nocleanwarn
+  echo "No" > /tmp/nocleanwarn
 fi
 
 while true