Revert the removal of Xreset and Xstartup.
This commit is contained in:
parent
8f9a6b1d79
commit
10783d146c
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2018/07/11 19:03:50 matthieu Exp $
|
||||
# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2018/07/15 09:05:11 matthieu Exp $
|
||||
.include <bsd.own.mk>
|
||||
|
||||
XENODMCONFIGDIR=/etc/X11/xenodm
|
||||
@ -25,7 +25,7 @@ realinstall:
|
||||
XENODMCONFIGFILES= \
|
||||
xenodm-config Xresources Xservers
|
||||
XENODMCONFIGSCRIPTS= \
|
||||
Xsession GiveConsole TakeConsole Xsetup_0
|
||||
Xsession GiveConsole TakeConsole Xsetup_0 Xstartup Xreset
|
||||
|
||||
afterinstall:
|
||||
$(INSTALL_DATA) ${.CURDIR}/config/OpenBSD_1bpp.xpm $(DESTDIR)$(PIXMAPDIR)
|
||||
|
@ -9,7 +9,9 @@ xenodmconfig_DATA = \
|
||||
Xservers
|
||||
|
||||
xenodmscript_SCRIPTS = \
|
||||
Xsession
|
||||
Xreset \
|
||||
Xsession \
|
||||
Xstartup
|
||||
|
||||
dist_xenodmscript_SCRIPTS = \
|
||||
GiveConsole \
|
||||
|
7
app/xenodm/config/Xreset.in
Normal file
7
app/xenodm/config/Xreset.in
Normal file
@ -0,0 +1,7 @@
|
||||
#!/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
|
13
app/xenodm/config/Xstartup.in
Normal file
13
app/xenodm/config/Xstartup.in
Normal file
@ -0,0 +1,13 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# $OpenBSD: Xstartup.in,v 1.3 2018/07/15 09:05:17 matthieu Exp $
|
||||
#
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
|
||||
if [ -f /etc/nologin ]; then
|
||||
/usr/X11R6/bin/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
|
@ -328,8 +328,10 @@ AC_CONFIG_FILES([Makefile
|
||||
include/Makefile
|
||||
man/Makefile
|
||||
xenodm/Makefile
|
||||
config/Xreset
|
||||
config/Xresources
|
||||
config/Xservers
|
||||
config/Xsession
|
||||
config/Xstartup
|
||||
config/xenodm-config])
|
||||
AC_OUTPUT
|
||||
|
Loading…
Reference in New Issue
Block a user