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

Proposed by Bill Filler on 2014-03-21
Status: Rejected
Rejected by: Steve Langasek on 2014-03-25
Proposed branch: lp:~bfiller/upstart/desktop-mode
Merge into: lp:ubuntu/trusty/upstart
Diff against target: 13 lines (+3/-0)
1 file modified
debian/user-conf/xsession-init.conf (+3/-0)
To merge this branch: bzr merge lp:~bfiller/upstart/desktop-mode
Reviewer Review Type Date Requested Status
Steve Langasek 2014-03-21 Disapprove on 2014-03-25
Dimitri John Ledkov 2014-03-25 Pending
Review via email:

Description of the change

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

To post a comment you must log in.
Ricardo Salveti (rsalveti) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/user-conf/xsession-init.conf'
2--- debian/user-conf/xsession-init.conf 2013-03-14 16:30:39 +0000
3+++ debian/user-conf/xsession-init.conf 2014-03-21 01:16:51 +0000
4@@ -6,6 +6,9 @@
6 pre-start script
7 [ -z "$DESKTOP_SESSION" ] && stop || true
8+ if [ $DESKTOP_SESSION != "ubuntu-touch" ]; then
9+ initctl set-env --global DESKTOP_MODE=1
10+ fi
11 end script
13 script


People subscribed via source and target branches

to all changes: