Merge lp:~lool/location-service/update-trust-store-job into lp:location-service/trunk

[Loïc Minier]

Update upstart job start conditions; workaround startup issue with a sleep.

Update upstart job start conditions; workaround startup issue with a sleep.

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/location-service-ci/283/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-amd64-ci/190
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/190
        deb: http://jenkins.qa.ubuntu.com/job/location-service-utopic-armhf-ci/190/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/location-service-utopic-i386-ci/190

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/283/rebuild

review: Approve (continuous-integration)

=== modified file 'data/ubuntu-location-service-trust-stored.conf.in'
--- data/ubuntu-location-service-trust-stored.conf.in	2014-08-13 09:50:27 +0000
+++ data/ubuntu-location-service-trust-stored.conf.in	2014-09-15 18:31:19 +0000
@@ -1,13 +1,22 @@
 description "Location Services Trust Store Daemon"
 
-start on (started JOB=dbus and started JOB=unity8) and (:sys:started JOB=ubuntu-location-service)
-stop on stopping JOB=dbus or (:sys:stopped JOB=ubuntu-location-service)
+# try to start this on session startup or once ubuntu-location-service finished
+# starting; if dbus is available and location-service isn't or vice-versa,
+# startup will fail but the next event firing will trigger another start
+start on (started dbus and xsession SESSION=ubuntu-touch) or \
+    :sys:started JOB=ubuntu-location-service
+stop on desktop-end or :sys:stopping JOB=ubuntu-location-service
 
 respawn
 
-exec /usr/bin/trust-stored-skeleton \
-    --remote-agent DBusRemoteAgent --bus=system \
-    --local-agent MirAgent \
-    --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
-    --for-service UbuntuLocationService \
-    --store-bus session
+script
+    # XXX LP #1369692
+    sleep 2
+
+    exec /usr/bin/trust-stored-skeleton \
+        --remote-agent DBusRemoteAgent --bus=system \
+        --local-agent MirAgent \
+        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
+        --for-service UbuntuLocationService \
+        --store-bus session
+end script