Merge lp:~nick-dedekind/unity8/trusted-socket.prompt-file into lp:unity8

[Nick Dedekind]

Added environment variable to upstart conf for mir trusted socket

 * Are there any related MPs required for this MP to build/function as expected? Please list.
No

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

 * 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?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Thomas Voß (thomas-voss)]

MIR_SERVER_PROMPT_FILE does not need the path to be assigned, but just set in the environment. For that, I would propose that we set it to ENABLED to emphasize its semantics.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

> MIR_SERVER_PROMPT_FILE does not need the path to be assigned, but just set in
> the environment. For that, I would propose that we set it to ENABLED to
> emphasize its semantics.

Ah. I thought it was same as MIR_SOCKET.
Fixed

[lp:~nick-dedekind/unity8/trusted-socket.prompt-file]

1047. By Nick Dedekind on 2014-07-16

dont set path. unset in post

1048. By Nick Dedekind on 2014-07-16

ENABLED->1

[Michał Sawicz (saviq)]

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

 * Did CI run pass? If not, please explain why.
Not yet, but no change to anything affecting.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1046
http://jenkins.qa.ubuntu.com/job/unity8-ci/3456/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2093
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/457/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/550
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/550/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/550
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3229
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9959

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3456/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'data/unity8.conf'
--- data/unity8.conf	2014-05-01 14:25:18 +0000
+++ data/unity8.conf	2014-07-16 15:52:12 +0000
@@ -44,6 +44,8 @@
         rm "$MIR_SERVER_FILE"
     fi
 
+    initctl set-env --global MIR_SERVER_PROMPT_FILE=1
+
     initctl emit scope-ui-starting
     initctl emit --no-wait indicator-services-start
 end script
@@ -53,4 +55,5 @@
 post-stop script
     initctl set-env --global MIR_SOCKET=$UNITY_MIR_SOCKET
     initctl unset-env --global UNITY_MIR_SOCKET
+    initctl unset-env --global MIR_SERVER_PROMPT_FILE
 end script