xinit: revert behaviour of running X in active tty.
This commit is contained in:
parent
0dd0f762e1
commit
5660060e52
|
@ -0,0 +1,24 @@
|
||||||
|
Revert this change that was committed to fix an issue with systemd.
|
||||||
|
|
||||||
|
We want to keep the original behaviour, i.e use the first unused vt.
|
||||||
|
|
||||||
|
--- startx.cpp.orig 2014-09-26 14:22:23.954772539 +0200
|
||||||
|
+++ startx.cpp 2014-09-26 14:22:32.993723320 +0200
|
||||||
|
@@ -188,17 +188,6 @@ XCOMM process server arguments
|
||||||
|
if [ x"$server" = x ]; then
|
||||||
|
server=$defaultserver
|
||||||
|
|
||||||
|
-#ifdef __linux__
|
||||||
|
- XCOMM When starting the defaultserver start X on the current tty to avoid
|
||||||
|
- XCOMM the startx session being seen as inactive:
|
||||||
|
- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
|
||||||
|
- tty=$(tty)
|
||||||
|
- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
|
||||||
|
- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
|
||||||
|
- vtarg="vt$tty_num"
|
||||||
|
- fi
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
|
||||||
|
if [ x"$serverargs" = x -a x"$display" = x ]; then
|
||||||
|
if [ -f "$userserverrc" ]; then
|
|
@ -1,7 +1,7 @@
|
||||||
# Template build file for 'xinit'.
|
# Template build file for 'xinit'.
|
||||||
pkgname=xinit
|
pkgname=xinit
|
||||||
version=1.3.4
|
version=1.3.4
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-xinitdir=/etc/X11/xinit"
|
configure_args="--with-xinitdir=/etc/X11/xinit"
|
||||||
hostmakedepends="pkg-config"
|
hostmakedepends="pkg-config"
|
||||||
|
|
Loading…
Reference in New Issue