Fixed hanging of system on shutdown caused by conflicts between tdm and plymouth.

This resolves bug 2806.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 013b337217)

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

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

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

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

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

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

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