summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2014-09-04 15:28:37 +0200
committerroot2014-09-04 15:28:37 +0200
commitafe1dcb4cf687a37d72b4ada43a882aaf3e2ddf1 (patch)
treef963ad64ea39a18b934ddf524ec4bf4d8139cd33
parent[cups] Fix ghostscript dependencies for Ubuntu 14.04 (diff)
downloadtm-scripts-afe1dcb4cf687a37d72b4ada43a882aaf3e2ddf1.tar.gz
tm-scripts-afe1dcb4cf687a37d72b4ada43a882aaf3e2ddf1.tar.xz
tm-scripts-afe1dcb4cf687a37d72b4ada43a882aaf3e2ddf1.zip
[kdm] Enable AutoLoginAgain (only relevant if AutoLogin is enabled; better for testing)
-rw-r--r--remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc2
-rw-r--r--remote/modules/kdm/data/etc/systemd/system/kdm.service2
2 files changed, 3 insertions, 1 deletions
diff --git a/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc b/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
index 196e1ce7..0b283d2a 100644
--- a/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
+++ b/remote/modules/kdm-theme-bwlp/data/etc/kde4/kdm/kdmrc
@@ -27,6 +27,8 @@ UseAdminSession=false
AllowRootLogin=true
AllowShutdown=All
AutoLoginEnable=false
+AutoLoginAgain=true
+AutoLoginDelay=5
ServerAttempts=2
# Custom directory so kdm never sees any other sessions - it's up to the vmchooser to list them
SessionsDirs=/opt/openslx/xsessions
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service
index 4f8ba944..e77d1cbd 100644
--- a/remote/modules/kdm/data/etc/systemd/system/kdm.service
+++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service
@@ -1,7 +1,7 @@
[Unit]
Description=KDM Display Manager
Conflicts=getty@tty7.service
-After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service
+After=systemd-user-sessions.service getty@tty7.service setup-slx-addon@nvidia_libs.service setup-slx-addon@vmware.service
[Service]
ExecStartPre=-/opt/openslx/bin/killall fbsplash