Merge lp:~unity-team/unity8/fix-split-dbus into lp:unity8

[Michał Sawicz]

Move env setup past session init in greeter wrapper.

[lp:~unity-team/unity8/fix-split-dbus]

940. By Michał Sawicz on 2014-06-03

Move env setup past session init.

[Oliver Grawert (ogra)]

we need to test that against calls etc ... PA_DISABLED seems to be essential for the telephony-service too function on locked greeters.

beyond that commment, it looks good.

review: Approve

[lp:~unity-team/unity8/fix-split-dbus]

941. By Oliver Grawert on 2014-06-03

Also manually start dbus.

942. By Oliver Grawert on 2014-06-03

Simpler session path passing.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:940
http://jenkins.qa.ubuntu.com/job/unity8-ci/3081/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/619
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/175
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/175/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/175
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1057
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1193
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1193/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8007

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:942
http://jenkins.qa.ubuntu.com/job/unity8-ci/3084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/623
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/178/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/178
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1060
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1200
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/1200/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/8013

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

review: Needs Fixing (continuous-integration)

=== modified file 'data/unity8-greeter-wrapper'
--- data/unity8-greeter-wrapper	2014-05-19 22:43:09 +0000
+++ data/unity8-greeter-wrapper	2014-06-03 10:31:45 +0000
@@ -32,6 +32,8 @@
 
 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
@@ -52,11 +54,6 @@
 # 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
@@ -67,6 +64,14 @@
 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