Make Xstartup/Xreset consistent with GiveConsole/TakeConsole

This commit is contained in:
matthieu 2018-07-15 09:53:23 +00:00
parent 3a72f101b6
commit d31532afbd
2 changed files with 6 additions and 8 deletions

View File

@ -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

View File

@ -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