diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2017-09-05 17:48:08 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:39 +0200 |
| commit | e34d49ac07b53ce4f4dc58010fcc940dba6a2bcf (patch) | |
| tree | 155559ac798afc9d98464aa18860bd37158d3a82 | |
| parent | 1f8e181db8ac69d82cd0ce10e3d122939fe5690d (diff) | |
backout hard-coded behaviour change which was not discussed, in particular no justification for why the current behaviour is wrong
| -rw-r--r-- | config/Xsetup_0 | 4 | ||||
| -rw-r--r-- | config/xenodm-config.in | 10 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/config/Xsetup_0 b/config/Xsetup_0 index b589864..acf72a9 100644 --- a/config/Xsetup_0 +++ b/config/Xsetup_0 @@ -1,6 +1,6 @@ #!/bin/sh -# $OpenBSD: Xsetup_0,v 1.2 2017/08/30 07:48:56 dcoppa Exp $ -if [ "$DISPLAY" = "unix:0" -o "$DISPLAY" = ":0" -o "$DISPLAY" = ":0.0" ] +# $OpenBSD: Xsetup_0,v 1.3 2017/09/05 17:48:07 deraadt Exp $ +if [ "$DISPLAY" = ":0" -o "$DISPLAY" = ":0.0" ] then xconsole -geometry 480x130-0-0 -daemon -notify -verbose -fn fixed -exitOnFail fi diff --git a/config/xenodm-config.in b/config/xenodm-config.in index 5d47e08..5c5e354 100644 --- a/config/xenodm-config.in +++ b/config/xenodm-config.in @@ -1,4 +1,4 @@ -! $OpenBSD: xenodm-config.in,v 1.3 2017/08/30 07:59:00 dcoppa Exp $ +! $OpenBSD: xenodm-config.in,v 1.4 2017/09/05 17:48:07 deraadt Exp $ ! DisplayManager.authDir: @XENODMXAUTHDIR@ DisplayManager.errorLogFile: @XENODMLOGDIR@/xenodm.log @@ -14,9 +14,9 @@ DisplayManager*startup: @XENODMSCRIPTDIR@/Xstartup DisplayManager*session: @XENODMSCRIPTDIR@/Xsession DisplayManager*reset: @XENODMSCRIPTDIR@/Xreset DisplayManager*authComplain: true -! The following three resources set up display unix:0 as the console. -DisplayManager.unix_0.setup: @XENODMSCRIPTDIR@/Xsetup_0 -DisplayManager.unix_0.startup: @XENODMSCRIPTDIR@/GiveConsole -DisplayManager.unix_0.reset: @XENODMSCRIPTDIR@/TakeConsole +! The following three resources set up display :0 as the console. +DisplayManager._0.setup: @XENODMSCRIPTDIR@/Xsetup_0 +DisplayManager._0.startup: @XENODMSCRIPTDIR@/GiveConsole +DisplayManager._0.reset: @XENODMSCRIPTDIR@/TakeConsole DisplayManager.*.authName: MIT-MAGIC-COOKIE-1 @@ -19747,12 +19747,12 @@ fi # Defaults for X session - should probably be configure --with-* flags # Currently just trying to mirror what defaults were set in Imake -# -DDEF_SERVER_LINE="unix:0 local $(DEF_SERVER) :0" +# -DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0" if test -z "$DEF_SERVER" ; then DEF_SERVER="${bindir}/X" fi if test -z "$DEF_SERVER_LINE" ; then - DEF_SERVER_LINE="unix:0 local ${DEF_SERVER} :0" + DEF_SERVER_LINE=":0 local ${DEF_SERVER} :0" fi prefix_NONE= diff --git a/configure.ac b/configure.ac index d40be3b..7670256 100644 --- a/configure.ac +++ b/configure.ac @@ -207,12 +207,12 @@ AC_SUBST(XENODM_LIBS) # Defaults for X session - should probably be configure --with-* flags # Currently just trying to mirror what defaults were set in Imake -# -DDEF_SERVER_LINE="unix:0 local $(DEF_SERVER) :0" +# -DDEF_SERVER_LINE=":0 local $(DEF_SERVER) :0" if test -z "$DEF_SERVER" ; then DEF_SERVER="${bindir}/X" fi if test -z "$DEF_SERVER_LINE" ; then - DEF_SERVER_LINE="unix:0 local ${DEF_SERVER} :0" + DEF_SERVER_LINE=":0 local ${DEF_SERVER} :0" fi AX_DEFINE_DIR(DEF_SERVER_LINE, DEF_SERVER_LINE, [Define to default Xserver file entry for local X server]) |