diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-07-24 02:16:36 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-07-24 02:18:35 +0200 |
| commit | 0be9f6f644adda8669b4956209833ffbd28d5f83 (patch) | |
| tree | 21bf851bf86ce1a5d893a6f2e40106496306877b | |
| parent | a69ee1355f7e88fd2b07b5b1079ceee7127a63fc (diff) | |
| download | tde-packaging-0be9f6f644adda8669b4956209833ffbd28d5f83.tar.gz tde-packaging-0be9f6f644adda8669b4956209833ffbd28d5f83.zip | |
Add systemd unit for tdm-trinity on Ubuntu
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e1a5231c98a1e7e9cae92fbd84cb2848c615a1a7)
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdm-trinity.postinst | 33 | ||||
| -rw-r--r-- | ubuntu/maverick/tdebase/debian/tdm-trinity.service | 12 |
2 files changed, 45 insertions, 0 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst index 84345e28b..4977c4998 100644 --- a/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.postinst @@ -44,6 +44,25 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" ]; then rm "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp" fi +# set default-display-manager systemd service link according to our config +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 + ln -sf "$SERVICE" "$DEFAULT_SERVICE" + else + echo "WARNING: $SERVICE is the selected default display manager but does not exist" >&2 + rm -f "$DEFAULT_SERVICE" + fi + else + rm -f "$DEFAULT_SERVICE" + fi +fi + # restarting the daemon may cause output to stdout db_stop @@ -122,6 +141,20 @@ case "$1" in esac +# Upstart is not active? +UPSTART_ACTIVE=`dbus-send --system --print-reply --dest=com.ubuntu.Upstart /com/ubuntu/Upstart org.freedesktop.DBus.Properties.Get string:com.ubuntu.Upstart0_6 string:version 2>/dev/null || true` +if [ -z "$UPSTART_ACTIVE" ]; then + echo "Upstart is not active - masking initctl" >&2 + dpkg-divert --local --rename --add /sbin/initctl + ln -s /bin/true /sbin/initctl +fi + #DEBHELPER# +# Upstart is not active? +if [ -z "$UPSTART_ACTIVE" ]; then + rm /sbin/initctl + dpkg-divert --local --rename --remove /sbin/initctl +fi + exit 0 diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.service b/ubuntu/maverick/tdebase/debian/tdm-trinity.service new file mode 100644 index 000000000..349823a9f --- /dev/null +++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.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 |