diff options
| -rwxr-xr-x | debian/_base/core/tdebase/debian/rules | 4 | ||||
| -rw-r--r-- | debian/_base/core/tdebase/debian/tdm-trinity.install | 2 | ||||
| -rw-r--r-- | debian/_base/core/tdebase/debian/tdm.service | 12 | ||||
| -rw-r--r-- | dilos/core/tdebase/debian/tdm-trinity.install | 1 | ||||
| -rw-r--r-- | dilos/core/tdebase/debian/tdm.service.2 | 12 | ||||
| -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 |
8 files changed, 8 insertions, 41 deletions
diff --git a/debian/_base/core/tdebase/debian/rules b/debian/_base/core/tdebase/debian/rules index d4d2d08d7..9fe5cc2bc 100755 --- a/debian/_base/core/tdebase/debian/rules +++ b/debian/_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/debian/_base/core/tdebase/debian/tdm-trinity.install b/debian/_base/core/tdebase/debian/tdm-trinity.install index e84c384b9..dc7d5e37f 100644 --- a/debian/_base/core/tdebase/debian/tdm-trinity.install +++ b/debian/_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/debian/_base/core/tdebase/debian/tdm.service b/debian/_base/core/tdebase/debian/tdm.service deleted file mode 100644 index 349823a9f..000000000 --- a/debian/_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 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 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 |