diff options
author | Jonathan Bauer | 2018-02-14 13:15:54 +0100 |
---|---|---|
committer | Jonathan Bauer | 2018-02-14 13:15:54 +0100 |
commit | 780e9ebdf01db68760d95d86d09f8bc37d676dba (patch) | |
tree | 6ada795174dd2b8fc4a76ead45026e670eb8e399 /core/modules/lightdm/templates | |
parent | [lightdm-greeter-bwlp] fix path (diff) | |
parent | [run-virt] relax /tmp mount detection regex (diff) | |
download | mltk-780e9ebdf01db68760d95d86d09f8bc37d676dba.tar.gz mltk-780e9ebdf01db68760d95d86d09f8bc37d676dba.tar.xz mltk-780e9ebdf01db68760d95d86d09f8bc37d676dba.zip |
Merge branch 'master' into install-mode
Diffstat (limited to 'core/modules/lightdm/templates')
-rw-r--r-- | core/modules/lightdm/templates/lightdm.service | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/modules/lightdm/templates/lightdm.service b/core/modules/lightdm/templates/lightdm.service index c40c40ca..8e7ab620 100644 --- a/core/modules/lightdm/templates/lightdm.service +++ b/core/modules/lightdm/templates/lightdm.service @@ -1,7 +1,8 @@ [Unit] Description=LightDM Display Manager +Conflicts=getty@tty7.service Requires=dev-tty7.device -After=dev-tty7.device systemd-user-sessions.service +After=dev-tty7.device systemd-user-sessions.service setup-slx-addon@nvidia_libs.service setup-slx-addon@vmware.service [Service] ExecStart=/usr/sbin/lightdm |