summaryrefslogtreecommitdiffstats
path: root/dilos/core
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-01-17 18:38:28 +0100
committerSlávek Banko <slavek.banko@axis.cz>2021-01-17 18:39:11 +0100
commitf229967711dc1d6640fcb74183c0d1047c9b5bf8 (patch)
tree52c04f1ccde1d0b3ff732c480ba703224b20a000 /dilos/core
parent0b32e6391b09e4c1802c5a5119ebc47d8d36c302 (diff)
downloadtde-packaging-f229967711dc1d6640fcb74183c0d1047c9b5bf8.tar.gz
tde-packaging-f229967711dc1d6640fcb74183c0d1047c9b5bf8.zip
DEB tdebase: Systemd unit file tdm.service has been moved to the main tree.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 36b0e78940f446154a80f064f8288832f2f87a6c)
Diffstat (limited to 'dilos/core')
-rw-r--r--dilos/core/tdebase/debian/tdm-trinity.install1
-rw-r--r--dilos/core/tdebase/debian/tdm.service.212
2 files changed, 0 insertions, 13 deletions
diff --git a/dilos/core/tdebase/debian/tdm-trinity.install b/dilos/core/tdebase/debian/tdm-trinity.install
index 8e3181d52..4e91c5434 100644
--- a/dilos/core/tdebase/debian/tdm-trinity.install
+++ b/dilos/core/tdebase/debian/tdm-trinity.install
@@ -1,5 +1,4 @@
debian/local/tdm.options etc/trinity/tdm/
-#debian/tdm.service lib/systemd/system/
debian/tmp/etc/trinity/tdm/tdmrc
debian/tmp/etc/trinity/tdm/Xaccess
debian/tmp/etc/trinity/tdm/Xreset
diff --git a/dilos/core/tdebase/debian/tdm.service.2 b/dilos/core/tdebase/debian/tdm.service.2
deleted file mode 100644
index 349823a9f..000000000
--- a/dilos/core/tdebase/debian/tdm.service.2
+++ /dev/null
@@ -1,12 +0,0 @@
-[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
-
-[Service]
-# temporary safety check until all DMs are converted to correct
-# display-manager.service symlink handling
-ExecStartPre=/bin/sh -c '[ "$(basename $(cat /etc/X11/default-display-manager 2>/dev/null))" = "tdm" ]'
-ExecStart=/opt/trinity/bin/tdm
-Restart=always