diff options
author | Matthieu Herrb <matthieu@herrb.eu> | 2016-01-02 11:08:04 +0100 |
---|---|---|
committer | Matthieu Herrb <matthieu@herrb.eu> | 2016-01-02 11:08:04 +0100 |
commit | 2d2d31444b148fec30a0225764e8e11ccb0587f3 (patch) | |
tree | 41fd7fbf45c7d0b0ef8f329c13d3cda0d5b7346e /startx.cpp | |
parent | 80148361451783388ffd7ba616447e3a175eca65 (diff) | |
parent | 72160c42bea2073bf95c01aca59a12f0ca7ab707 (diff) |
Merge remote-tracking branch 'origin/master' into obsd
Diffstat (limited to 'startx.cpp')
-rw-r--r-- | startx.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -91,10 +91,10 @@ if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then fi fi -if [ -x XINITDIR/privileged_startx ] ; then +if [ -x __libexecdir__/privileged_startx ] ; then # Don't push this into the background becasue it can cause # a race to create /tmp/.X11-unix - XINITDIR/privileged_startx + __libexecdir__/privileged_startx fi if [ x`defaults read $X11_PREFS_DOMAIN no_auth` = x0 ] ; then |