summaryrefslogtreecommitdiffstats
path: root/remote/modules/kdm/data
diff options
context:
space:
mode:
authorSimon Rettberg2013-04-29 16:37:33 +0200
committerSimon Rettberg2013-04-29 16:37:33 +0200
commit98c7c2c6b4c177b7ce52acf041df0761996b67a9 (patch)
tree2b1e6854d51bdde7946d11adc968f45a72548ed2 /remote/modules/kdm/data
parentMore fixes to kernel source fetching etc. (diff)
parentdelete old files (diff)
downloadtm-scripts-98c7c2c6b4c177b7ce52acf041df0761996b67a9.tar.gz
tm-scripts-98c7c2c6b4c177b7ce52acf041df0761996b67a9.tar.xz
tm-scripts-98c7c2c6b4c177b7ce52acf041df0761996b67a9.zip
Merge branch 'master' of openslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote/modules/kdm/data')
-rwxr-xr-xremote/modules/kdm/data/etc/kde4/kdm/Xsetup6
-rw-r--r--remote/modules/kdm/data/etc/kde4/kdm/kdmrc9
2 files changed, 11 insertions, 4 deletions
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/Xsetup b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
new file mode 100755
index 00000000..a31d61e4
--- /dev/null
+++ b/remote/modules/kdm/data/etc/kde4/kdm/Xsetup
@@ -0,0 +1,6 @@
+#! /bin/sh
+# Xsetup - run as root before the login dialog appears
+
+#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &
+
+#/sbin/initctl -q emit login-session-start DISPLAY_MANAGER=kdm
diff --git a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
index 72625705..855e9aa7 100644
--- a/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm/data/etc/kde4/kdm/kdmrc
@@ -18,12 +18,13 @@ UseAdminSession=true
AllowRootLogin=true
AllowShutdown=All
AutoLoginEnable=false
-Reset=/etc/kde4/kdm/Xreset
+#Reset=/etc/kde4/kdm/Xreset
ServerAttempts=2
-Session=/etc/kde4/kdm/Xsession
+#TODO: Xsession doesn't work because scripts are missing under /etc/X11/Xsession.d/
+#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