diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-20 10:12:40 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2015-06-20 10:12:40 +0000 |
| commit | 5affd5560a42956f657dc47d9918b94fe8dc17aa (patch) | |
| tree | fd7420eb9aea00d8509f5dfda2396b3edaf4d731 | |
| parent | ecb42d928335a3e6b083cdae174b326793079d69 (diff) | |
Now that nolisten tcp is the Xserver default, don't pass the option
in scripts anymore.
| -rw-r--r-- | app/xdm/config/Xservers.ws.cpp | 2 | ||||
| -rw-r--r-- | app/xinit/Makefile.bsd-wrapper | 6 | ||||
| -rw-r--r-- | app/xinit/openbsd/xserverrc | 3 |
3 files changed, 2 insertions, 9 deletions
diff --git a/app/xdm/config/Xservers.ws.cpp b/app/xdm/config/Xservers.ws.cpp index 24cfa9a8d..b6089ef5e 100644 --- a/app/xdm/config/Xservers.ws.cpp +++ b/app/xdm/config/Xservers.ws.cpp @@ -9,4 +9,4 @@ XCOMM you can add them here as well. Each X terminal line should XCOMM look like: XCOMM XTerminalName:0 foreign XCOMM -:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp +:0 local BINDIR/X :0 DEFAULTVT diff --git a/app/xinit/Makefile.bsd-wrapper b/app/xinit/Makefile.bsd-wrapper index 6e181b485..f981a84d0 100644 --- a/app/xinit/Makefile.bsd-wrapper +++ b/app/xinit/Makefile.bsd-wrapper @@ -1,7 +1,3 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2015/06/15 16:17:46 matthieu Exp $ - -afterinstall: - $(INSTALL) -m 644 ${.CURDIR}/openbsd/xserverrc \ - $(DESTDIR)/etc/X11/xinit +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2015/06/20 10:12:39 matthieu Exp $ .include <bsd.xorg.mk> diff --git a/app/xinit/openbsd/xserverrc b/app/xinit/openbsd/xserverrc deleted file mode 100644 index 8c1e13822..000000000 --- a/app/xinit/openbsd/xserverrc +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -# $OpenBSD: xserverrc,v 1.1 2015/06/15 16:17:46 matthieu Exp $ -exec /usr/X11R6/bin/X -nolisten tcp "$@" |