Merge lp:~attente/unity8/1634508 into lp:unity8

Proposed by William Hua on 2016-10-18
Status: Needs review
Proposed branch: lp:~attente/unity8/1634508
Merge into: lp:unity8
Diff against target: 24 lines (+4/-1)
1 file modified
data/unity8.conf (+4/-1)
To merge this branch: bzr merge lp:~attente/unity8/1634508
Reviewer Review Type Date Requested Status
Michał Sawicz 2016-10-18 Needs Information on 2016-11-11
Review via email: mp+308737@code.launchpad.net

Description of the change

Sanitize the environment after stopping unity 8

To post a comment you must log in.
Michał Sawicz (saviq) :
review: Needs Information
Albert Astals Cid (aacid) wrote :

Text conflict in data/unity8.conf
1 conflicts encountered.

Unmerged revisions

2659. By Iain Lane on 2016-10-18

Sanitize the environment after stopping unity 8

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 2016-06-27 18:42:23 +0000
3+++ data/unity8.conf 2016-10-18 14:37:12 +0000
4@@ -31,7 +31,7 @@
5 # Point all future jobs in this session to our Mir socket instead of
6 # unity-system-compositor's socket.
7 initctl set-env --global MIR_SOCKET=$MIR_SERVER_FILE
8- gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "@a{ss} {'MIR_SOCKET': '$MIR_SERVER_FILE'}"
9+ dbus-update-activation-environment --verbose --systemd MIR_SOCKET=${MIR_SERVER_FILE}
10 fi
11
12 # Remove the normal and trusted sockets if still there
13@@ -82,8 +82,11 @@
14 end script
15
16 post-stop script
17+ dbus-update-activation-environment --verbose --systemd MIR_SOCKET=${UNITY_MIR_SOCKET}
18 initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
19+ dbus-update-activation-environment --verbose --systemd UNITY_MIR_SOCKET=
20 initctl unset-env --global UNITY_MIR_SOCKET
21+ dbus-update-activation-environment --verbose --systemd MIR_SERVER_PROMPT_FILE=
22 initctl unset-env --global MIR_SERVER_PROMPT_FILE
23 initctl emit application-end
24 end script

Subscribers

People subscribed via source and target branches