summaryrefslogtreecommitdiffstats
path: root/remote/modules/kdm/data
diff options
context:
space:
mode:
authorSimon Rettberg2013-05-14 16:41:56 +0200
committerSimon Rettberg2013-05-14 16:41:56 +0200
commit113ce521770232a6d99cdb07dd55d8879214c213 (patch)
treec1233152bfb18b8bd427cf3a1178900bfd768d8c /remote/modules/kdm/data
parentultrastracke 2 (diff)
parentultrastracke update (diff)
downloadtm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.gz
tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.tar.xz
tm-scripts-113ce521770232a6d99cdb07dd55d8879214c213.zip
Merge branch 'master' of openslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/kdm/data')
-rw-r--r--remote/modules/kdm/data/etc/kde4/kdm/kdmrc8
1 files changed, 4 insertions, 4 deletions
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index 855e9aa7..2cd04adc 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -18,13 +18,13 @@ UseAdminSession=true
AllowRootLogin=true
AllowShutdown=All
AutoLoginEnable=false
-#Reset=/etc/kde4/kdm/Xreset
+Reset=/etc/kde4/kdm/Xreset
ServerAttempts=2
#TODO: Xsession doesn't work because scripts are missing under /etc/X11/Xsession.d/
-#Session=/etc/kde4/kdm/Xsession
+Session=/etc/kde4/kdm/Xsession
SessionsDirs=/etc/X11/session,/usr/share/xsessions,/usr/share/apps/kdm/sessions
-#Setup=/etc/kde4/kdm/Xsetup
-#Startup=/etc/kde4/kdm/Xstartup
+Setup=/etc/kde4/kdm/Xsetup
+Startup=/etc/kde4/kdm/Xstartup
[X-:0-Greeter]
LogSource=/dev/xconsole