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

[William Hua]

Sanitize the environment after stopping unity 8

[Michał Sawicz (saviq)]

review: Needs Information

[Albert Astals Cid (aacid)]

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

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