Merge lp:~mterry/ubuntu-touch-session/socket into lp:ubuntu-touch-session

[Michael Terry]

Make sure to publish unity8's Mir socket for the benefit of any other apps that launch in the session.

Make sure to publish unity8's Mir socket for the benefit of any other apps that launch in the session.

Currently, Mir clients happen to find unity8 because they both hardcode /tmp/mir_socket as the fallback socket. But Mir is moving towards a more dynamic, potentially nested world. And we should actually determine and publicize the right socket in such cases.

[Loïc Minier (lool)]

Ah this dates from when socket was in /tmp, and indeed we just moved it.

However we moved it to $XDG_RUNTIME_DIR/mir_socket as a file (not a dir with socket named after PID), so this branch conflicts with the upstream change now.

[Michael Terry (mterry)]

No it doesn't conflict, but it isn't necessary if Mir defaults to XDG_RUNTIME_DIR now (and likewise, the change in Mir would have been unnecessary if this had been merged). But I thought people were looking to revert the change in Mir for something less invasive?

This branch tells unity8 which socket to use, instead of relying on Mir's default.

Unmerged revisions

104. By Michael Terry on 2013-09-18

Make directory

=== modified file 'upstart-session/unity8.conf'
--- upstart-session/unity8.conf	2013-09-17 21:53:16 +0000
+++ upstart-session/unity8.conf	2013-09-18 16:15:20 +0000
@@ -13,5 +13,11 @@
 
 script 
     sleep 2
+
+    # Point all future jobs in this session to our Mir socket
+    mkdir -p $XDG_RUNTIME_DIR/mir_socket
+    export MIR_SERVER_FILE=$XDG_RUNTIME_DIR/mir_socket/$$
+    initctl set-env MIR_SOCKET=$MIR_SERVER_FILE
+
     exec unity8
 end script