diff options
| author |   Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2014-03-14 15:44:11 +0100 |
|---|---|---|
| committer | Chi-Thanh Christopher Nguyen <chithanh@gentoo.org> | 2014-03-14 15:44:11 +0100 |
| commit | d8e4737e54d5c8fb3187444377fe64f94378d598 (patch) | |
| tree | 16c34cb0b728315af7433562e73170c077aaf17a | |
| parent | media-libs/mesa: Add DRI3 USE flag, bug #504356. (diff) | |
| download | x11-d8e4737e54d5c8fb3187444377fe64f94378d598.tar.gz x11-d8e4737e54d5c8fb3187444377fe64f94378d598.tar.bz2 x11-d8e4737e54d5c8fb3187444377fe64f94378d598.zip | |
x11-apps/xinit: import changes to xserverrc for bug #451956.
| -rwxr-xr-x | x11-apps/xinit/files/xserverrc | 2 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xserverrc.1 | 6 | ||||
| -rw-r--r-- | 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 b4de2528..00000000 --- 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 00000000..6b57eeba --- /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 25feda1d..4a5d44a8 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" |