diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2021-01-17 18:38:28 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-01-17 18:39:11 +0100 |
| commit | f229967711dc1d6640fcb74183c0d1047c9b5bf8 (patch) | |
| tree | 52c04f1ccde1d0b3ff732c480ba703224b20a000 /ubuntu/_base | |
| parent | 0b32e6391b09e4c1802c5a5119ebc47d8d36c302 (diff) | |
| download | tde-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 'ubuntu/_base')
| -rwxr-xr-x | ubuntu/_base/core/tdebase/debian/rules | 4 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdebase/debian/tdm-trinity.install | 2 | ||||
| -rw-r--r-- | ubuntu/_base/core/tdebase/debian/tdm.service | 12 |
3 files changed, 4 insertions, 14 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index 7a19a5435..92a1fca86 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -30,10 +30,12 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_GCC_VISIBILITY="ON" \ + -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \ + -DSYSTEMDSYSTEMUNITDIR="/lib/systemd/system" \ -DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" \ -DTDM_PAM_SERVICE="tdm-trinity" \ -DTDESCREENSAVER_PAM_SERVICE="tdescreensaver-trinity" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" \ -DWITH_PAM="ON" \ diff --git a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install index e84c384b9..dc7d5e37f 100644 --- a/ubuntu/_base/core/tdebase/debian/tdm-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/tdm-trinity.install @@ -1,5 +1,5 @@ debian/local/tdm.options etc/trinity/tdm/ -debian/tdm.service lib/systemd/system/ +debian/tmp/lib/systemd/system/tdm.service debian/tmp/etc/trinity/tdm/tdmrc debian/tmp/etc/trinity/tdm/Xaccess debian/tmp/etc/trinity/tdm/Xreset diff --git a/ubuntu/_base/core/tdebase/debian/tdm.service b/ubuntu/_base/core/tdebase/debian/tdm.service deleted file mode 100644 index 349823a9f..000000000 --- a/ubuntu/_base/core/tdebase/debian/tdm.service +++ /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 |