commit: d8e4737e54d5c8fb3187444377fe64f94378d598
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 14 14:44:11 2014 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin
<DOT> de>
CommitDate: Fri Mar 14 14:44:11 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d8e4737e
x11-apps/xinit: import changes to xserverrc for bug #451956.
---
x11-apps/xinit/files/xserverrc | 2 --
x11-apps/xinit/files/xserverrc.1 | 6 ++++++
x11-apps/xinit/xinit-9999.ebuild | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
deleted file mode 100755
index b4de252..0000000
--- a/x11-apps/xinit/files/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
new file mode 100755
index 0000000..6b57eeb
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.1
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+ exec /usr/bin/X -nolisten tcp "$@"
+else
+ exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
diff --git a/x11-apps/xinit/xinit-9999.ebuild b/x11-apps/xinit/xinit-9999.ebuild
index 25feda1..4a5d44a 100644
--- a/x11-apps/xinit/xinit-9999.ebuild
+++ b/x11-apps/xinit/xinit-9999.ebuild
@@ -46,7 +46,7 @@ src_install() {
exeinto /etc/X11/Sessions
doexe "${FILESDIR}"/Xsession
exeinto /etc/X11/xinit
- doexe "${FILESDIR}"/xserverrc
+ newexe "${FILESDIR}"/xserverrc.1 xserverrc
exeinto /etc/X11/xinit/xinitrc.d/
doexe "${FILESDIR}/00-xhost"
