diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2018-07-15 09:53:24 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:42 +0200 |
| commit | 58a1521752527d53562ace66a19d1ae6db2cd3d9 (patch) | |
| tree | 7841fbb66c2d95600c097dafc9d3a2f7feb5d34a | |
| parent | 584a8755cd3d785a6bd01c669bd6dedd4957fea7 (diff) | |
Make Xstartup/Xreset consistent with GiveConsole/TakeConsole
| -rw-r--r-- | config/Xreset.in | 7 | ||||
| -rw-r--r-- | config/Xstartup.in | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/config/Xreset.in b/config/Xreset.in index a3949e4..c05084c 100644 --- a/config/Xreset.in +++ b/config/Xreset.in @@ -1,7 +1,6 @@ #!/bin/sh # Deregister a login. (Derived from TakeConsole as follows:) # -prefix=@prefix@ -exec_prefix=@exec_prefix@ -@bindir@/sessreg -d -w @WTMP_FILE@ -u @UTMP_FILE@ \ - -x @XENODMCONFIGDIR@/Xservers -l $DISPLAY -h "" $USER +prefix="@prefix@" +exec_prefix="@exec_prefix@" +@bindir@/sessreg -d -l $DISPLAY -u none $USER diff --git a/config/Xstartup.in b/config/Xstartup.in index a1da63c..c42a16a 100644 --- a/config/Xstartup.in +++ b/config/Xstartup.in @@ -1,13 +1,12 @@ #!/bin/sh # -# $OpenBSD: Xstartup.in,v 1.3 2018/07/15 09:05:17 matthieu Exp $ +# $OpenBSD: Xstartup.in,v 1.4 2018/07/15 09:53:23 matthieu Exp $ # prefix="@prefix@" exec_prefix="@exec_prefix@" if [ -f /etc/nologin ]; then - /usr/X11R6/bin/xmessage -file /etc/nologin -timeout 30 -center + @bindir@/xmessage -file /etc/nologin -timeout 30 -center exit 1 fi -exec @bindir@/sessreg -a -w @WTMP_FILE@ -u @UTMP_FILE@ \ - -x @XENODMCONFIGDIR@/Xservers -l $DISPLAY -h "" $USER +exec @bindir@/sessreg -a -l $DISPLAY -u none $USER |