From: Grazvydas Ignotas Date: Mon, 9 May 2016 23:37:27 +0000 (+0300) Subject: pandora-skel: .xinitrc fixes X-Git-Tag: sz_175~14 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d6404c795514de00135e85c78b79891c8ca47dc;p=openpandora.oe.git pandora-skel: .xinitrc fixes finally solve that stray "Failed to execute login command" --- diff --git a/recipes/pandora-system/pandora-skel.bb b/recipes/pandora-system/pandora-skel.bb index 5245c74..c60e819 100644 --- a/recipes/pandora-system/pandora-skel.bb +++ b/recipes/pandora-system/pandora-skel.bb @@ -5,7 +5,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" # /etc/skel is used by Shadow's useradd so you really have that installed for this to make sense ;) RDEPENDS = "shadow" -PR = "r31" +PR = "r32" SRC_URI = " \ file://.xinitrc \ diff --git a/recipes/pandora-system/pandora-skel/.xinitrc b/recipes/pandora-system/pandora-skel/.xinitrc index fd4bb3f..8c57d69 100644 --- a/recipes/pandora-system/pandora-skel/.xinitrc +++ b/recipes/pandora-system/pandora-skel/.xinitrc @@ -110,11 +110,18 @@ do if [ "$SESSION" == "" ] then - exit 1 + # wait for all Xfce processes to exit cleanly + wait + + # report success to slim + exit 0 fi $SESSION + # lame hack + killall configbutton 2> /dev/null + SESSION=$(cat /tmp/gui.load 2> /dev/null) STOP_SESSION=$(grep $SESSION /etc/pandora/conf/gui.conf | awk -F\; '{print $4}') echo $STOP_SESSION > /tmp/gui.stop