Merge lp:~mterry/unity8/dbus-x11 into lp:unity8

[Michael Terry]

Launch dbus ourselves in the greeter, don't use the upstart job.

Otherwise we lose control on what is started in the greeter, 'cause there's a lot of jobs that "start on dbus started".

Bring back dbus-x11 to fix dbus usage in user session more properly.

We can't use the existing hack of starting dbus via upstart for greeter session.

A better long term fix is to use dbus-x11's dbus-launch like the Desktop does but stop LightDM from parsing Xsession.d for user sessions as it seems to insist on doing (which is https://code.launchpad.net/~mterry/ubuntu-touch-session/no-lightdm-session/+merge/221891)

== Checklist ==

 * Are there any related MPs required for this MP to build/function as expected? Please list.
 - Yes, https://code.launchpad.net/~mterry/ubuntu-touch-session/no-lightdm-session/+merge/221891

 * Did you perform an exploratory manual test run of your code change and any related functionality?
 - Yes, you can see that session only gets one dbus-daemon with both these branches

 * 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?
 - I'm on that team.

 * If you changed the UI, has there been a design review?
 - NA

[lp:~mterry/unity8/dbus-x11]

944. By Michael Terry on 2014-06-03

Undo wrapper changes too

945. By Michael Terry on 2014-06-03

Bump version

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:945
http://jenkins.qa.ubuntu.com/job/unity8-ci/3089/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/635
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/127
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/183
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/183/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1071
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1217
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1217/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8029

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

review: Needs Fixing (continuous-integration)

[lp:~mterry/unity8/dbus-x11]

946. By Michael Terry on 2014-06-03

Manually start dbus-daemon to avoid pulling in dbus-x11 after all

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:946
http://jenkins.qa.ubuntu.com/job/unity8-ci/3091/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/646
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1077
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1237
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1237/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8043

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

This still doesn't launch dialer for me :/. It does unlock, but doesn't launch the greeter in either of greeter or session...

review: Needs Fixing

[Michał Sawicz (saviq)]

Oh it looks like url-dispatcher is completely broken.

[Michał Sawicz (saviq)]

OK, that was a fallout of a mis-migrated upstart^Wubuntu-app-launch rename.

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

 * Did CI run pass? If not, please explain why.
Known greeter test fail :|

review: Approve

=== modified file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2014-06-03 10:31:34 +0000
+++ data/unity8-greeter-wrapper	2014-06-03 20:29:55 +0000
@@ -24,6 +24,9 @@
     if [ -n "$INIT_PID" ]; then
         kill "$INIT_PID"
     fi
+    if [ -n "$DBUS_PID" ]; then
+        kill "$DBUS_PID"
+    fi
     if [ -n "$CMD_PID" ]; then
         kill "$CMD_PID"
     fi
@@ -32,8 +35,6 @@
 
 set_greeter_var()
 {
-    # Only use this after upstart has been started, otherwise multiple dbus
-    # daemons are spawned.
     export "$1=$2"
     gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.UpdateActivationEnvironment "{'$1': '$2'}"
     if [ -n "$INIT_PID" ]; then
@@ -41,6 +42,14 @@
     fi
 }
 
+# Start dbus if it hasn't already been started for us (such as on the Desktop
+# images by dbus-launch).  We don't want to use dbus-launch ourselves because
+# we don't want dbus-x11 on the Touch images.
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    export DBUS_SESSION_BUS_ADDRESS=unix:abstract=$(mktemp -u /tmp/dbus-XXXXXXXXXX)
+    DBUS_PID=$(dbus-daemon --fork --session --print-pid --address="$DBUS_SESSION_BUS_ADDRESS")
+fi
+
 SUB_SOCKET=$XDG_RUNTIME_DIR/mir_socket
 rm -f $SUB_SOCKET # clear socket in case we were hard shut down
 
@@ -54,6 +63,11 @@
 # will start.
 export DESKTOP_SESSION=ubuntu-touch
 
+# We disable ofono using pulse.  It causes problems with racing with the user's
+# pulse.  We need to come up with a better long-term fix for this, because we
+# eventually need the greeter to play ringtones for users that aren't logged in.
+set_greeter_var PA_DISABLED 1
+
 # Normal unity8 sessions are entirely driven by Upstart.  But greeters
 # are special.  They need access to the file descriptors that lightdm
 # creates for them and don't want to start all the services that a normal
@@ -64,14 +78,6 @@
 while [ ! -e "$XDG_RUNTIME_DIR/upstart/sessions/$INIT_PID.session" ]; do sleep 0.1; done
 export UPSTART_SESSION=$(/sbin/initctl list-sessions | grep "^$INIT_PID " | cut -d' ' -f2)
 
-/sbin/initctl start dbus
-export DBUS_SESSION_BUS_ADDRESS="$(/sbin/initctl get-env DBUS_SESSION_BUS_ADDRESS)"
-
-# We disable ofono using pulse.  It causes problems with racing with the user's
-# pulse.  We need to come up with a better long-term fix for this, because we
-# eventually need the greeter to play ringtones for users that aren't logged in.
-set_greeter_var PA_DISABLED 1
-
 # Start any pre-greeter tasks if needed (like wizard)
 /sbin/initctl emit unity8-greeter-starting
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-06-03 10:33:11 +0000
+++ debian/changelog	2014-06-03 20:29:55 +0000
@@ -1,3 +1,9 @@
+unity8 (7.88) UNRELEASED; urgency=medium
+
+  * Bump version so ubuntu-touch-session can reference this one
+
+ -- Michael Terry <[e-mail]>  Tue, 03 Jun 2014 10:55:03 -0400
+
 unity8 (7.87+14.10.20140603.1-0ubuntu1) utopic; urgency=low
 
   [ CI bot ]