Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts

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