diff options
| author | Simon Rettberg | 2013-11-27 14:54:32 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-27 14:54:32 +0100 |
| commit | be2e955259f356a1f1b62789f15ed45649f21b04 (patch) | |
| tree | 517474216b715b7b7229efb0bb362d282ea4a322 /remote | |
| parent | [rfs-stage32] Improved slxlog a bit (diff) | |
| parent | [vmchooser] fix wrong path to config file. Fixes wrong theme on startup (diff) | |
| download | tm-scripts-be2e955259f356a1f1b62789f15ed45649f21b04.tar.gz tm-scripts-be2e955259f356a1f1b62789f15ed45649f21b04.tar.xz tm-scripts-be2e955259f356a1f1b62789f15ed45649f21b04.zip | |
Merge branch 'master' of simonslx:openslx-ng/tm-scripts
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/modules/kdm/data/etc/systemd/system/kdm.service | 1 | ||||
| -rwxr-xr-x | remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/remote/modules/kdm/data/etc/systemd/system/kdm.service b/remote/modules/kdm/data/etc/systemd/system/kdm.service index 9882459f..6a7810c8 100644 --- a/remote/modules/kdm/data/etc/systemd/system/kdm.service +++ b/remote/modules/kdm/data/etc/systemd/system/kdm.service @@ -1,6 +1,7 @@ [Unit] Description=KDM Display Manager Conflicts=getty@tty7.service +Wants=plymouth-quit.service After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service activate-nss-ldap.service [Service] diff --git a/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop b/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop index 66f97e68..9d3a472d 100755 --- a/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop +++ b/remote/modules/vmchooser/data/opt/openslx/xsessions/default.desktop @@ -4,7 +4,7 @@ Name=virtual machine chooser (default) Name[de]=Virtuelle Maschine auswählen Comment=This session starts the vm session chooser Comment[de]=Diese Sitzung startet das Auswahlmenü für die vorhandenen Sitzungen -Exec=/opt/openslx/bin/vmchooser -c /opt/openslx/etc/vmchooser/vmchooser.conf +Exec=/opt/openslx/bin/vmchooser -c /opt/openslx/vmchooser/config/vmchooser.conf TryExec=/opt/openslx/bin/vmchooser Icon= Type=Application |