From 792dcb70908ef0c2311d237a156a40e92ee34e0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 20 Sep 2015 05:08:25 +0200 Subject: Rename tdm-trinity.service on Ubuntu to match name of tdm binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 55eba1f800c4e92d2359ce052e677f2bb36a4ed5) --- ubuntu/maverick/tdebase/debian/tdm-trinity.install | 1 + ubuntu/maverick/tdebase/debian/tdm-trinity.postinst | 1 - ubuntu/maverick/tdebase/debian/tdm-trinity.service | 12 ------------ ubuntu/maverick/tdebase/debian/tdm.service | 12 ++++++++++++ 4 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 ubuntu/maverick/tdebase/debian/tdm-trinity.service create mode 100644 ubuntu/maverick/tdebase/debian/tdm.service (limited to 'ubuntu') diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.install b/ubuntu/maverick/tdebase/debian/tdm-trinity.install index afcf37d7b..b69800a6f 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.install @@ -1,4 +1,5 @@ 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/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst index c33169e82..ec394f9cf 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst @@ -49,7 +49,6 @@ DEFAULT_SERVICE=/etc/systemd/system/display-manager.service if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then SERVICE=/lib/systemd/system/$(basename $(cat "$DEFAULT_DISPLAY_MANAGER_FILE")).service - SERVICE=`echo "$SERVICE" | sed "s/tdm\./tdm-trinity./"` if [ -h "$DEFAULT_SERVICE" ] && [ $(readlink "$DEFAULT_SERVICE") = /dev/null ]; then echo "Display manager service is masked" >&2 elif [ -e "$SERVICE" ]; then diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.service b/ubuntu/maverick/tdebase/debian/tdm-trinity.service deleted file mode 100644 index 349823a9f..000000000 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.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/ubuntu/maverick/tdebase/debian/tdm.service b/ubuntu/maverick/tdebase/debian/tdm.service new file mode 100644 index 000000000..349823a9f --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm.service @@ -0,0 +1,12 @@ +[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 -- cgit v1.2.3