summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-14 13:05:26 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-04-14 13:05:26 -0700
commitfe5af014f2645d1ecf981d40d3c10a3621e9ec56 (patch)
tree0f28a073e9a85c0a7456a8021636522770e1377f /startx.cpp
parentd5590dba3cce39367762d39822094ca51000142b (diff)
Apple: Wait for privileged_startx to finish, so we don't race to create /tmp/.X11-unix
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/startx.cpp b/startx.cpp
index ab4f7d0..7e67769 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -105,7 +105,9 @@ if [ x`defaults read org.x.X11 cache_fonts` = x1 ] ; then
fi
if [ -x XINITDIR/privileged_startx ] ; then
- XINITDIR/privileged_startx &
+ # Don't push this into the background becasue it can cause
+ # a race to create /tmp/.X11-unix
+ XINITDIR/privileged_startx
fi
if [ x`defaults read org.x.X11 no_auth` = x0 ] ; then