diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 17:11:18 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-13 17:11:18 -0400 |
| commit | 278000a3b8a64fd000ddd8198f76bd2bf78e4557 (patch) | |
| tree | 678dd30356203871af1a3c62ef087de9a3981637 /.config/X11 | |
| parent | 596fe4b1610df0a7f5a0ea174d136d179ee08440 (diff) | |
| parent | 39db29c39dcca6d47fbc56dffd8c0c7bf63beb51 (diff) | |
Merge branch 'master' into build64-par/master
Diffstat (limited to '.config/X11')
| -rwxr-xr-x | .config/X11/clientrc | 1 | ||||
| -rw-r--r--[l---------] | .config/X11/serverrc | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.config/X11/clientrc b/.config/X11/clientrc index 4773ea4..2c965da 100755 --- a/.config/X11/clientrc +++ b/.config/X11/clientrc @@ -17,6 +17,7 @@ if [ -f "$usermodmap" ]; then xmodmap "$usermodmap" fi +[ -n "$XDG_RUNTIME_DIR" ] || exit 1 trap "rm -f $(printf '%q' "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}")" EXIT mkfifo "${XDG_RUNTIME_DIR}/x11-wm@${DISPLAY}" diff --git a/.config/X11/serverrc b/.config/X11/serverrc index ce14133..6b57eeb 120000..100644 --- a/.config/X11/serverrc +++ b/.config/X11/serverrc @@ -1 +1,6 @@ -/etc/X11/xinit/xserverrc
\ No newline at end of file +#!/bin/sh +if [ -z "$XDG_VTNR" ]; then + exec /usr/bin/X -nolisten tcp "$@" +else + exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR +fi |