TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source 
This resolves bug 2806.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/247/head
Michele Calgaro 3 years ago
parent 1f39afd8d1
commit 013b337217
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File

4
tdm/tdm.service.cmake
Unescape View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service Conflicts=getty@tty7.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
[Service] [Service]
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm

7
tdm/tdm.service.debian.cmake
Unescape View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service Conflicts=getty@tty7.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
[Service] [Service]
# temporary safety check until all DMs are converted to correct # 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" ]' ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm
Restart=always Restart=always
[Install]
Alias=display-manager.service

4
tdm/tdm.service.fedora-18.cmake
Unescape View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty1.service plymouth-quit.service Conflicts=getty@tty1.service
After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service livesys-late.service systemd-logind.service
[Service] [Service]
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm

4
tdm/tdm.service.fedora-19.cmake
Unescape View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty1.service plymouth-quit.service 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] [Service]
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm

2
tdm/tdm.service.fedora.cmake
Unescape View File

@ -2,7 +2,7 @@
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty1.service 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] [Service]
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm

2
tdm/tdm.service.rhel.cmake
Unescape View File

@ -2,7 +2,7 @@
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty1.service 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] [Service]
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm

7
tdm/tdm.service.ubuntu.cmake
Unescape View File

@ -1,8 +1,8 @@
[Unit] [Unit]
Description=Trinity Display Manager Description=Trinity Display Manager
Documentation=man:tdm-trinity(1) Documentation=man:tdm-trinity(1)
Conflicts=getty@tty7.service plymouth-quit.service Conflicts=getty@tty7.service
After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service After=systemd-user-sessions.service getty@tty7.service plymouth-quit.service systemd-logind.service
[Service] [Service]
# temporary safety check until all DMs are converted to correct # 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" ]' ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
ExecStart=@BIN_INSTALL_DIR@/tdm ExecStart=@BIN_INSTALL_DIR@/tdm
Restart=always Restart=always
[Install]
Alias=display-manager.service

Write Preview
Loading…
Cancel
Save