unity8-desktop-session

Merge lp:~aacid/unity8-desktop-session/fix_logout into lp:unity8-desktop-session

  1. fix_logout
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Stephen M. Webb
Approved revision: 50
Merged at revision: 55
Proposed branch: lp:~aacid/unity8-desktop-session/fix_logout
Merge into: lp:unity8-desktop-session
Prerequisite: lp:~laney/unity8-desktop-session/tweaks
Diff against target: 13 lines (+3/-0)
1 file modified
data/unity8-mir.conf.in (+3/-0)
To merge this branch: bzr merge lp:~aacid/unity8-desktop-session/fix_logout
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Review via email: mp+221905@code.launchpad.net

This proposal supersedes a proposal from 2014-05-28.

Commit message

Bring it closer to unity8 upstart .conf file

Fixes going back to when unity8 quits

Description of the change

At the moment logout from the indicator still doesn't work because it's calling the wrong dbus function, but if you call the correct dbus function it will properly logout with this patch.

To post a comment you must log in.
Revision history for this message
Stephen M. Webb (bregma) wrote : Posted in a previous version of this proposal

Part of this MP has already been done by https://code.launchpad.net/~laney/unity8-desktop-session/tweaks/+merge/219883 ... please rebase and depend on that branch so we can get it all in.

review: Needs Fixing
Revision history for this message
Stephen M. Webb (bregma) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/unity8-mir.conf.in'
2--- data/unity8-mir.conf.in 2014-06-03 15:12:31 +0000
3+++ data/unity8-mir.conf.in 2014-06-03 15:12:31 +0000
4@@ -12,6 +12,9 @@
5 env UPSTART_JOB=unity8
6
7 pre-start script
8+ # Tell unity-mir to raise SIGSTOP after we start
9+ initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
10+
11 if [ -n "$MIR_SOCKET" ]; then
12 if [ -z "$UNITY_MIR_SOCKET" ]; then
13 # Save original value of MIR_SOCKET in case we are restarted,

Subscribers

People subscribed via source and target branches