summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick/tdebase/debian/tdm-trinity.conf')
-rwxr-xr-xubuntu/maverick/tdebase/debian/tdm-trinity.conf25
1 files changed, 17 insertions, 8 deletions
diff --git a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
index f63b85e3d..fcec2ea00 100755
--- a/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
+++ b/ubuntu/maverick/tdebase/debian/tdm-trinity.conf
@@ -6,16 +6,18 @@
description "TDE Display Manager"
author "Richard Johnson and Timothy Pearson"
-start on (filesystem
- and (started hal or started hal-trinity)
- and (graphics-device-added fb0 PRIMARY_DEVICE_FOR_DISPLAY=1
- or drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
- or stopped udevtrigger))
-stop on runlevel [016]
+start on ((filesystem
+ and runlevel [!06]
+ and started dbus
+ and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1
+ or stopped udev-fallback-graphics))
+ or runlevel PREVLEVEL=S)
-emits starting-dm
+stop on runlevel [016]
-respawn
+emits login-session-start
+emits desktop-session-start
+emits desktop-shutdown
script
[ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ]
@@ -46,3 +48,10 @@ script
exec /opt/trinity/bin/tdm
end script
+
+post-stop script
+ if [ "$UPSTART_STOP_EVENTS" = runlevel ]; then
+ initctl emit desktop-shutdown
+ fi
+end script
+