diff options
| author | Simon Rettberg | 2013-06-22 19:33:20 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2013-06-22 19:33:20 +0200 |
| commit | 1126c915edcf371c9981706e97708c5e9984c07a (patch) | |
| tree | 8b8ea5935591661ed37913852ba3a21ad1a19f30 /remote/modules/kdm/data | |
| parent | Merge branch 'master' of simonslx:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.tar.gz tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.tar.xz tm-scripts-1126c915edcf371c9981706e97708c5e9984c07a.zip | |
[kdm] Add comments to kdmrc, change session directory
[dbus] Add rule that allows root to listen to all dbus communication (for debugging)
[vmchooser] move session file to new session directory
Diffstat (limited to 'remote/modules/kdm/data')
| -rw-r--r-- | remote/modules/kdm/data/etc/kde4/kdm/kdmrc | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc index 26da07d2..c72b73be 100644 --- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc +++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc @@ -1,6 +1,8 @@ [General] PidFile=/var/run/kdm.pid ServerVTs=-7 +# Always spawn :0 (this is the default but it won't hurt) +StaticServers=:0 [X-*-Greeter] UseTheme=true @@ -9,32 +11,41 @@ UseBackground=false GreetString=OpenSLX Workstation (%h) SelectedUsers= UserList=false +AuthComplain=true +AntiAliasing=true [X-:*-Greeter] AllowClose=false UseAdminSession=true -[X-:0-Core] +[X-:0-Greeter] +LogSource=/dev/xconsole +PreselectUser=None +UseAdminSession=false + +[X-*-Core] AllowRootLogin=true AllowShutdown=All AutoLoginEnable=false -Reset=/etc/kde4/kdm/Xreset ServerAttempts=2 -#TODO: Xsession doesn't work because scripts are missing under /etc/X11/Xsession.d/ +# Custom directory so kdm never sees any other sessions - it's up to the vmchooser to list them +SessionsDirs=/opt/openslx/xsessions + +# Session is executed to start the user's session (as the user) +# "One of the keywords failsafe, default or custom, or a string to eval by a Bourne-compatible shell is passed as the first argument." Session=/etc/kde4/kdm/Xsession -SessionsDirs=/etc/X11/session,/usr/share/xsessions,/usr/share/apps/kdm/sessions +# Reset is run after a session terminates (as root) +Reset=/etc/kde4/kdm/Xreset +# Setup is executed once before the greeter starts (as root) Setup=/etc/kde4/kdm/Xsetup +# Startup is executed on successful authentication, before the session is opened (as root) Startup=/etc/kde4/kdm/Xstartup -[X-:0-Greeter] -LogSource=/dev/xconsole -PreselectUser=None -UseAdminSession=false - [Shutdown] +AllowFifo=false HaltCmd=/usr/bin/systemctl -ff poweroff RebootCmd=/usr/bin/systemctl -ff reboot -[xdmcp] +[Xdmcp] Enable=false |