diff options
| author | David Coppa <dcoppa@cvs.openbsd.org> | 2017-08-30 07:48:57 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@herrb.eu> | 2020-07-14 15:52:38 +0200 |
| commit | 7b521912a153e2d37b15b6fa931133f86c47be27 (patch) | |
| tree | 41c5827d0cc66bb173c4d79644fd7c65f6298948 | |
| parent | 912a60cf399a46173c2b0db4396e7f4d6521ebfa (diff) | |
Use 'unix:0' for the DISPLAY environment variable
ok matthieu@
| -rw-r--r-- | config/Xsetup_0 | 4 | ||||
| -rw-r--r-- | config/xenodm-config.in | 8 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/config/Xsetup_0 b/config/Xsetup_0 index a24818c..b589864 100644 --- a/config/Xsetup_0 +++ b/config/Xsetup_0 @@ -1,6 +1,6 @@ #!/bin/sh -# $OpenBSD: Xsetup_0,v 1.3 2010/03/28 09:33:02 matthieu Exp $ -if [ "$DISPLAY" = ":0" -o "$DISPLAY" = ":0.0" ] +# $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" ] 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 0ca1b5d..fe9384f 100644 --- a/config/xenodm-config.in +++ b/config/xenodm-config.in @@ -1,4 +1,4 @@ -! $OpenBSD: xenodm-config.in,v 1.1 2017/07/26 21:14:54 matthieu Exp $ +! $OpenBSD: xenodm-config.in,v 1.2 2017/08/30 07:48:56 dcoppa Exp $ ! DisplayManager.authDir: @XENODMXAUTHDIR@ DisplayManager.errorLogFile: @XENODMLOGDIR@/xenodm.log @@ -15,8 +15,8 @@ DisplayManager*session: @XENODMSCRIPTDIR@/Xsession DisplayManager*reset: @XENODMSCRIPTDIR@/Xreset DisplayManager*authComplain: true ! 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.unix_0.setup: @XENODMSCRIPTDIR@/Xsetup_0 +DisplayManager.unix_0.startup: @XENODMSCRIPTDIR@/GiveConsole +DisplayManager.unix_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=":0 local $(DEF_SERVER) :0" +# -DDEF_SERVER_LINE="unix: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=":0 local ${DEF_SERVER} :0" + DEF_SERVER_LINE="unix:0 local ${DEF_SERVER} :0" fi prefix_NONE= diff --git a/configure.ac b/configure.ac index 7670256..d40be3b 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=":0 local $(DEF_SERVER) :0" +# -DDEF_SERVER_LINE="unix: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=":0 local ${DEF_SERVER} :0" + DEF_SERVER_LINE="unix: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]) |