diff options
| -rw-r--r-- | tdm/tdm.service.cmake | 4 | ||||
| -rw-r--r-- | tdm/tdm.service.debian.cmake | 7 | ||||
| -rw-r--r-- | tdm/tdm.service.fedora-18.cmake | 4 | ||||
| -rw-r--r-- | tdm/tdm.service.fedora-19.cmake | 4 | ||||
| -rw-r--r-- | tdm/tdm.service.fedora.cmake | 2 | ||||
| -rw-r--r-- | tdm/tdm.service.rhel.cmake | 2 | ||||
| -rw-r--r-- | tdm/tdm.service.ubuntu.cmake | 7 |
7 files changed, 18 insertions, 12 deletions
diff --git a/tdm/tdm.service.cmake b/tdm/tdm.service.cmake index 0918e9316..37befc1d5 100644 --- a/tdm/tdm.service.cmake +++ b/tdm/tdm.service.cmake @@ -1,8 +1,8 @@ [Unit] Description=Trinity Display Manager Documentation=man:tdm-trinity(1) -Conflicts=getty@tty7.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service +Conflicts=getty@tty7.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service [Service] ExecStart=@BIN_INSTALL_DIR@/tdm diff --git a/tdm/tdm.service.debian.cmake b/tdm/tdm.service.debian.cmake index 9222898c4..3ba232aa1 100644 --- a/tdm/tdm.service.debian.cmake +++ b/tdm/tdm.service.debian.cmake @@ -1,8 +1,8 @@ [Unit] Description=Trinity Display Manager Documentation=man:tdm-trinity(1) -Conflicts=getty@tty7.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service +Conflicts=getty@tty7.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service [Service] # temporary safety check until all DMs are converted to correct @@ -10,3 +10,6 @@ After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]' ExecStart=@BIN_INSTALL_DIR@/tdm Restart=always + +[Install] +Alias=display-manager.service diff --git a/tdm/tdm.service.fedora-18.cmake b/tdm/tdm.service.fedora-18.cmake index 47fb4756b..cd1bdc54d 100644 --- a/tdm/tdm.service.fedora-18.cmake +++ b/tdm/tdm.service.fedora-18.cmake @@ -1,8 +1,8 @@ [Unit] Description=Trinity Display Manager Documentation=man:tdm-trinity(1) -Conflicts=getty@tty1.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service systemd-logind.service [Service] ExecStart=@BIN_INSTALL_DIR@/tdm diff --git a/tdm/tdm.service.fedora-19.cmake b/tdm/tdm.service.fedora-19.cmake index f6de77607..9b57961e3 100644 --- a/tdm/tdm.service.fedora-19.cmake +++ b/tdm/tdm.service.fedora-19.cmake @@ -1,8 +1,8 @@ [Unit] Description=Trinity Display Manager Documentation=man:tdm-trinity(1) -Conflicts=getty@tty1.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service +Conflicts=getty@tty1.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service [Service] ExecStart=@BIN_INSTALL_DIR@/tdm diff --git a/tdm/tdm.service.fedora.cmake b/tdm/tdm.service.fedora.cmake index 23dc1b32b..9b57961e3 100644 --- a/tdm/tdm.service.fedora.cmake +++ b/tdm/tdm.service.fedora.cmake @@ -2,7 +2,7 @@ Description=Trinity Display Manager Documentation=man:tdm-trinity(1) Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service [Service] ExecStart=@BIN_INSTALL_DIR@/tdm diff --git a/tdm/tdm.service.rhel.cmake b/tdm/tdm.service.rhel.cmake index 23dc1b32b..9b57961e3 100644 --- a/tdm/tdm.service.rhel.cmake +++ b/tdm/tdm.service.rhel.cmake @@ -2,7 +2,7 @@ Description=Trinity Display Manager Documentation=man:tdm-trinity(1) Conflicts=getty@tty1.service -After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service [Service] ExecStart=@BIN_INSTALL_DIR@/tdm diff --git a/tdm/tdm.service.ubuntu.cmake b/tdm/tdm.service.ubuntu.cmake index 9222898c4..3ba232aa1 100644 --- a/tdm/tdm.service.ubuntu.cmake +++ b/tdm/tdm.service.ubuntu.cmake @@ -1,8 +1,8 @@ [Unit] Description=Trinity Display Manager Documentation=man:tdm-trinity(1) -Conflicts=getty@tty7.service plymouth-quit.service -After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service +Conflicts=getty@tty7.service +After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service [Service] # temporary safety check until all DMs are converted to correct @@ -10,3 +10,6 @@ After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]' ExecStart=@BIN_INSTALL_DIR@/tdm Restart=always + +[Install] +Alias=display-manager.service |