Merge lp:~bregma/unity8/merge-desktop-upstart-job into lp:unity8

Proposed by Stephen M. Webb
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1136
Merged at revision: 1145
Proposed branch: lp:~bregma/unity8/merge-desktop-upstart-job
Merge into: lp:unity8
Diff against target: 12 lines (+1/-1)
1 file modified
data/unity8.conf (+1/-1)
To merge this branch: bzr merge lp:~bregma/unity8/merge-desktop-upstart-job
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Michał Sawicz Approve
Review via email: mp+230016@code.launchpad.net

Commit message

enables the unity8 upstart job for desktop sessions

Description of the change

Makes the Unity 8 upstart job work for desktop, too.

Requires the corresponding unity8-desktop-session changes to land at the same time, or the desktop will be seriously broken.

To post a comment you must log in.
1136. By Stephen M. Webb

removed non-existent surfaceflinger session

Revision history for this message
Michał Sawicz (saviq) wrote :

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Yes.

 * Did CI run pass? If not, please explain why.
Waiting, CI are timing out today :/ But no test-related changes anyway.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/unity8.conf'
2--- data/unity8.conf 2014-07-24 23:40:35 +0000
3+++ data/unity8.conf 2014-08-08 13:32:57 +0000
4@@ -3,7 +3,7 @@
5
6 emits indicator-services-start
7
8-start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
9+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus
10 stop on desktop-end
11
12 kill timeout 120

Subscribers

People subscribed via source and target branches