From d7edf12e452374ac6ea186886e1330b14c1538b7 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Wed, 7 Apr 2010 00:37:56 +0200 Subject: [PATCH] .xinitrc: Changed so that it uses a config file for the GUI selection --- recipes/pandora-system/pandora-skel/.xinitrc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/recipes/pandora-system/pandora-skel/.xinitrc b/recipes/pandora-system/pandora-skel/.xinitrc index 0be7790..77a9664 100644 --- a/recipes/pandora-system/pandora-skel/.xinitrc +++ b/recipes/pandora-system/pandora-skel/.xinitrc @@ -48,6 +48,7 @@ kill -1 pndnotifyd & # 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,6 +66,10 @@ 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 + # 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 @@ -82,7 +87,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 -- 2.39.2