diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-06-20 02:59:16 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-06-20 02:59:16 +0000 |
| commit | 13b06d4e40a4d8a309b97dbab13cd6ac6aa469ad (patch) | |
| tree | cad007acbfe128f7feba35f19621a1c35f989a1e | |
| parent | f890eac42449a34b258128749075220f860421c3 (diff) | |
Bug #2959: Make sure displays other than :0 get entries in utmp whenXORG-6_8_99_14XORG-6_8_99_13
started from xdm. (Tim Waugh)
| -rw-r--r-- | config/Xreset | 5 | ||||
| -rw-r--r-- | config/Xstartup | 5 | ||||
| -rw-r--r-- | config/xdm-config.cpp | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/config/Xreset b/config/Xreset new file mode 100644 index 0000000..d89d237 --- /dev/null +++ b/config/Xreset @@ -0,0 +1,5 @@ +#!/bin/sh +# Deregister a login. (Derived from TakeConsole as follows:) +# +/usr/X11R6/bin/sessreg -d -w "/var/log/wtmp" -u "/var/run/utmp" \ + -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/config/Xstartup b/config/Xstartup new file mode 100644 index 0000000..4929f41 --- /dev/null +++ b/config/Xstartup @@ -0,0 +1,5 @@ +#!/bin/sh +# Register a login (derived from GiveConsole as follows:) +# +/usr/X11R6/bin/sessreg -a -w "/var/log/wtmp" -u "/var/run/utmp" \ + -x "/etc/X11/xdm/Xservers" -l $DISPLAY -h "" $USER diff --git a/config/xdm-config.cpp b/config/xdm-config.cpp index 1ccba8a..5b5ac79 100644 --- a/config/xdm-config.cpp +++ b/config/xdm-config.cpp @@ -15,15 +15,17 @@ DisplayManager.willing: SU nobody -c XDMDIR/Xwilling ! X terminals may not be configured that way, so they will require ! individual resource settings. DisplayManager*authorize: true -! The following three resources set up display :0 as the console. -DisplayManager._0.setup: XDMDIR/Xsetup_0 -DisplayManager._0.startup: XDMDIR/GiveConsole -DisplayManager._0.reset: XDMDIR/TakeConsole ! DisplayManager*chooser: CHOOSERPATH DisplayManager*resources: XDMDIR/Xresources +DisplayManager*startup: XDMDIR/Xstartup DisplayManager*session: XDMDIR/Xsession +DisplayManager*reset: XDMDIR/Xreset DisplayManager*authComplain: true +! The following three resources set up display :0 as the console. +DisplayManager._0.setup: XDMDIR/Xsetup_0 +DisplayManager._0.startup: XDMDIR/GiveConsole +DisplayManager._0.reset: XDMDIR/TakeConsole #ifdef XPM DisplayManager*loginmoveInterval: 10 #endif /* XPM */ |