[people/amarx/ipfire-3.x.git] / xorg-x11-xinit / patches / xorg-x11-xinit-1.3.2-systemd-logind.patch

diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
--- xinit-1.3.2.orig/startx.cpp	2012-09-29 11:55:06.661264745 -0600
+++ xinit-1.3.2/startx.cpp	2012-09-29 11:56:24.849771316 -0600
@@ -80,6 +80,7 @@
 defaultdisplay=":0"
 clientargs=""
 serverargs=""
+tty_num=$(tty | grep -oE '[0-9]+$')
 
 #ifdef __APPLE__
 
@@ -135,6 +136,15 @@
 enable_xauth=1
 #endif
 
+if [ x"$tty_num" != x ]; then
+    # Specify TTY number directly to avoid recognizing startx session as
+    # inactive: RHBZ#820675
+    serverargs=${serverargs}" vt"${tty_num}
+else
+    echo "Error getting tty num"
+    exit 1
+fi
+
 XCOMM Automatically determine an unused $DISPLAY
 d=0
 while true ; do
Commit	Line	Data
eabec946 SS	1	diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp
	2	--- xinit-1.3.2.orig/startx.cpp 2012-09-29 11:55:06.661264745 -0600
	3	+++ xinit-1.3.2/startx.cpp 2012-09-29 11:56:24.849771316 -0600
	4	@@ -80,6 +80,7 @@
	5	defaultdisplay=":0"
	6	clientargs=""
	7	serverargs=""
	8	+tty_num=$(tty \| grep -oE '[0-9]+$')
	9
	10	#ifdef __APPLE__
	11
	12	@@ -135,6 +136,15 @@
	13	enable_xauth=1
	14	#endif
	15
	16	+if [ x"$tty_num" != x ]; then
	17	+ # Specify TTY number directly to avoid recognizing startx session as
	18	+ # inactive: RHBZ#820675
	19	+ serverargs=${serverargs}" vt"${tty_num}
	20	+else
	21	+ echo "Error getting tty num"
	22	+ exit 1
	23	+fi
	24	+
	25	XCOMM Automatically determine an unused $DISPLAY
	26	d=0
	27	while true ; do