Merge lp:~mterry/unity8/dbus-x11 into lp:unity8
Status: | Merged |
---|---|
Approved by: | Michał Sawicz |
Approved revision: | 946 |
Merged at revision: | 943 |
Proposed branch: | lp:~mterry/unity8/dbus-x11 |
Merge into: | lp:unity8 |
Diff against target: |
78 lines (+22/-10) 2 files modified
data/unity8-greeter-wrapper (+16/-10) debian/changelog (+6/-0) |
To merge this branch: | bzr merge lp:~mterry/unity8/dbus-x11 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michał Sawicz | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+221894@code.launchpad.net |
Commit message
Launch dbus ourselves in the greeter, don't use the upstart job.
Otherwise we lose control on what is started in the greeter, 'cause there's a lot of jobs that "start on dbus started".
Description of the change
Bring back dbus-x11 to fix dbus usage in user session more properly.
We can't use the existing hack of starting dbus via upstart for greeter session.
A better long term fix is to use dbus-x11's dbus-launch like the Desktop does but stop LightDM from parsing Xsession.d for user sessions as it seems to insist on doing (which is https:/
== Checklist ==
* Are there any related MPs required for this MP to build/function as expected? Please list.
- Yes, https:/
* Did you perform an exploratory manual test run of your code change and any related functionality?
- Yes, you can see that session only gets one dbus-daemon with both these branches
* Did you make sure that your branch does not contain spurious tags?
- Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
- I'm on that team.
* If you changed the UI, has there been a design review?
- NA
FAILED: Continuous integration, rev:945 jenkins. qa.ubuntu. com/job/ unity8- ci/3089/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/635 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- utopic/ 127 jenkins. qa.ubuntu. com/job/ unity8- utopic- amd64-ci/ 183 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 183 jenkins. qa.ubuntu. com/job/ unity8- utopic- armhf-ci/ 183/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity8- utopic- i386-ci/ 183 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/1071 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1217 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/1217/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 8029
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/3089/ rebuild
http://