.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 0be7790..cebf5af 100644 (file)
--- a/recipes/pandora-system/pandora-skel/.xinitrc
+++ b/recipes/pandora-system/pandora-skel/.xinitrc
@@ -41,13 +41,20 @@ fi
 #Load up the proper keymap for X
 xmodmap ~/.pndXmodmap
 
+#Write the current user into /tmp/currentuser for any scripts or programs who want to make use of it
+whoami > /tmp/currentuser
+id -u > /tmp/currentuid
+chmod 777 /tmp/currentuser
+chmod 777 /tmp/currentuid
+
 # HUP pndnotifyd to make sure it picks up the users home.
-kill -1 pndnotifyd &
+killall -1 pndnotifyd &
 
 # The following variable defines the session which is started if the user
 # doesn't explicitely select a session in SLiM.
 
 DEFAULT_SESSION=startxfce4
+STOP_SESSION="xfce4-session-logout --logout"
 
 # Write the default session into a temporary file.
 # This way, we can easily add new sessions in the future by just
@@ -65,11 +72,38 @@ if [ "$SESSION" == "" ]
        SESSION=$(cat /tmp/gui.load)
 fi
 
+STOP_SESSION=$(grep $SESSION /etc/pandora/conf/gui.conf | awk -F\; '{print $4}')
+echo $STOP_SESSION > /tmp/gui.stop
+chmod +x /tmp/gui.stop
+
+# Disable screen blanking if uncommented
+# DISPLAY=:0 xset s off
+
 # Starts our session and checks if a new session should be loaded
 # after the old one is quit by simply executing the command that's in /tmp/gui.load
 
 # 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.
+# echo'ing the new session executable into /tmp/gui.load and exiting.    
+
+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 $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
+  echo "No" > /tmp/nocleanwarn
+fi
 
 while true
 do
@@ -82,7 +116,9 @@ do
        fi
 
        $SESSION
-
+        
        SESSION=$(cat /tmp/gui.load)
-
+       STOP_SESSION=$(grep $SESSION /etc/pandora/conf/gui.conf | awk -F\; '{print $4}')
+        echo $STOP_SESSION > /tmp/gui.stop
+        chmod +x /tmp/gui.stop
 done