diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-30 02:47:10 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-03-30 02:47:10 -0500 |
| commit | 2db328f5ab594ad20b050dcf4563418897d0e68b (patch) | |
| tree | bf07b7830ae7168a3385c117196034f43cb911be /ubuntu/maverick/tdebase/debian/tdm-trinity.conf | |
| parent | cbca0a26de2f4cd4f8ba77dd749fcc0898809bf8 (diff) | |
| download | tde-packaging-2db328f5ab594ad20b050dcf4563418897d0e68b.tar.gz tde-packaging-2db328f5ab594ad20b050dcf4563418897d0e68b.zip | |
Remove HAL dependency from tdebase
Diffstat (limited to 'ubuntu/maverick/tdebase/debian/tdm-trinity.conf')
| -rwxr-xr-x | ubuntu/maverick/tdebase/debian/tdm-trinity.conf | 25 |
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 + |