Unity 8

Merge lp:~bregma/unity8/lp-1596069 into lp:unity8

lp-1596069
Merge into trunk

Proposed by Stephen M. Webb on 2016-06-24

Status:

Rejected

Rejected by:

Stephen M. Webb on 2016-06-29

Proposed branch:

lp:~bregma/unity8/lp-1596069

Merge into:

lp:unity8

Diff against target:

54 lines (+16/-18)

1 file modified

data/unity8.conf (+16/-18)

To merge this branch:

bzr merge lp:~bregma/unity8/lp-1596069

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Christopher Townsend		2016-06-24	Approve on 2016-06-27
Unity8 CI Bot	continuous-integration		Approve on 2016-06-25
Review via email: mp+298341@code.launchpad.net

Commit Message

removed unnecessary Mir server socket redirection logic from the Unity 8 upstart job

Description of the Change

Removed the logic involved with redirecting Mir server sockets from the Unity 8 upstart job because a change in LightDM made it unnecessary, and the conditional logic was preventing XApps from launching successfully.

Stephen M. Webb (bregma) wrote on 2016-06-24:

Turns out this will break on vivid. Needs more changes.

Stephen M. Webb (bregma) wrote on 2016-06-24:

Verified on vivid+overlay, xenial+overlay, and yakkety.

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-24:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1615/rebuild

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-06-25:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1616/rebuild

review: Approve (continuous-integration)

Christopher Townsend (townsend) wrote on 2016-06-27:

I have also confirmed this for all supported versions and also allows X apps to work again.

review: Approve

Marco Trevisan (Treviño) (3v1n0) wrote on 2016-06-29:

You can get rid of the gdbus call now.

Stephen M. Webb (bregma) wrote on 2016-06-29:

Change is no longer required because the bug introduced by LightDM has been fixed by another unrelated change to unity8.conf.

Unmerged revisions

2495. By Stephen M. Webb on 2016-06-24: accounted for older LightDM in vivid+overlay
2494. By Stephen M. Webb on 2016-06-24: switch upstart job to rely on MIR_SERVER_HOST_SOCKET and not MIR_SOCKET

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Stephen M. Webb

Unity Team

 === modified file 'data/unity8.conf'
 --- data/unity8.conf	2016-06-17 01:19:03 +0000
 +++ data/unity8.conf	2016-06-24 20:41:57 +0000
@@ -15,25 +15,25 @@
      # Tell unity-mir to raise SIGSTOP after we start
      initctl set-env UNITY_MIR_EMITS_SIGSTOP=1
++    # Older versions of LightDM use an incorrect variable for the Mir socket, so
++    # update the environment.
      if [ -n "$MIR_SOCKET" ]; then
--        # FIXME Create an autopilot test that makes sure start+stop and restart
--        #       work fine at least 2 times
--        # Save original value of MIR_SOCKET in case we are stopped,
--        # as we modify the variable for future jobs, including ourself.
--        UNITY_MIR_SOCKET=$(initctl get-env --global MIR_SOCKET)
--        initctl set-env --global UNITY_MIR_SOCKET=$UNITY_MIR_SOCKET
--
--        # Point unity8 at unity-system-compositor
--        MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
--        initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
--        initctl set-env MIR_SERVER_HOST_SOCKET=$UNITY_MIR_SOCKET
--
--        # 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'}"
++        initctl set-env MIR_SERVER_HOST_SOCKET=$MIR_SOCKET
      fi
++    # Create the client socket for the nested Unity 8 Mir server and export it
++    # to the upstart environment.
++    MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket
++    initctl set-env MIR_SERVER_FILE=$MIR_SERVER_FILE
++
++    # Point all future jobs in this session to the nested Unity 8 Mir socket instead of
++    # the 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'}"
++
      # Remove the normal and trusted sockets if still there
      if [ -S "$MIR_SERVER_FILE" ]; then
          rm "$MIR_SERVER_FILE"
@@ -69,8 +69,6 @@
  end script
  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
      initctl emit application-end
  end script