36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From 72939fed64b00be4a74dd0e1bf0b418e00ac4c57 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Fri, 20 Mar 2015 14:30:08 +0100
|
||
|
|
Subject: [PATCH xinit 3/3] startx: Make startx auto display select work with
|
||
|
|
per user /tmp dirs
|
||
|
|
|
||
|
|
If a separate /tmp per user is used the existing auto display select code
|
||
|
|
does not work, add an extra check for the unix socket for the display number
|
||
|
|
existing in /proc/net/unix (linux only).
|
||
|
|
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
---
|
||
|
|
startx.cpp | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/startx.cpp b/startx.cpp
|
||
|
|
index fe49996..3b0dd86 100644
|
||
|
|
--- a/startx.cpp
|
||
|
|
+++ b/startx.cpp
|
||
|
|
@@ -120,7 +120,11 @@ enable_xauth=1
|
||
|
|
XCOMM Automatically determine an unused $DISPLAY
|
||
|
|
d=0
|
||
|
|
while true ; do
|
||
|
|
- [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] || break
|
||
|
|
+ [ -e "/tmp/.X$d-lock" -o -S "/tmp/.X11-unix/X$d" ] ||
|
||
|
|
+#ifdef __linux__
|
||
|
|
+ grep -q "/tmp/.X11-unix/X$d" "/proc/net/unix" ||
|
||
|
|
+#endif
|
||
|
|
+ break
|
||
|
|
d=$(($d + 1))
|
||
|
|
done
|
||
|
|
defaultdisplay=":$d"
|
||
|
|
--
|
||
|
|
2.3.3
|
||
|
|
|