Merge lp:~bfiller/upstart/desktop-mode into lp:ubuntu/trusty/upstart

[Bill Filler]

set global env var DESKTOP_MODE needed by touch apps when running on non-touch sessions like the desktop

[Ricardo Salveti (rsalveti)]

Change looks fine, but would like someone from the foundations team to review this as well.

Just to know, are we able to change the variable name or it is already being used by our applications?

[Steve Langasek (vorlon)]

Per discussion on IRC, we should do this differently by having apps detect an existing feature of the X environment (e.g., $DISPLAY being set) instead of setting another variable.

review: Disapprove

Unmerged revisions

1546. By Bill Filler on 2014-03-21

set DESKTOP_MODE env var on all session but ubuntu-touch

=== modified file 'debian/user-conf/xsession-init.conf'
--- debian/user-conf/xsession-init.conf	2013-03-14 16:30:39 +0000
+++ debian/user-conf/xsession-init.conf	2014-03-21 01:16:51 +0000
@@ -6,6 +6,9 @@
 
 pre-start script
     [ -z "$DESKTOP_SESSION" ] && stop || true
+    if [ $DESKTOP_SESSION != "ubuntu-touch" ]; then
+        initctl set-env --global DESKTOP_MODE=1
+    fi
 end script
 
 script