summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@queued.net>2009-02-11 17:18:05 -0500
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-08-03 19:47:48 -0700
commit33c3dae16b632ab56b6b361273a48079eb0a41c4 (patch)
treebbd0469e310d33a0a1544d6623236573c21ee40c /startx.cpp
parent028b0839dc4079c8fe56b38a80be51dc8c89ea17 (diff)
app/xinit: make startx's $? a useful value
When startx fails to start X, it's most likely xinit that failed. xinit returns a proper return code (1), but that gets clobbed in the startx script by clean-up commands. This patch saves $? from xinit and forces startx to exit with that value. This way, if startx actually fails to start X, $? reflects that. Signed-off-by: Andres Salomon <dilinger@debian.org>
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/startx.cpp b/startx.cpp
index 943fa78..a1adbf5 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -320,6 +320,7 @@ XINIT "$client" $clientargs -- "$server" $display $serverargs
#endif
#endif
+retval=$?
if [ x"$enable_xauth" = x1 ] ; then
if [ x"$removelist" != x ]; then
@@ -347,3 +348,6 @@ screenrestore
#if defined(sun)
kbd_mode -a
#endif
+
+exit $retval
+