Merge lp:~chihchun/ubuntu-touch-session/lp1582148 into lp:ubuntu-touch-session

[Rex Tsai]

Reload trust-stored, when use switched locale in the welcome wizard.

When the user change locale in Welcome Wizard, unity8 sends indicator-services-end and indicator-services-start to ask other service eg indicator-services reloaded for the new locale.

https://bugs.launchpad.net/bugs/1582148

[Timo Jyrinki (timo-jyrinki)]

This MP still needs top-approval, the ticket is stuck: https://requests.ci-train.ubuntu.com/#/ticket/1652

[Rex Tsai (chihchun)]

The patch should be clean enough to be landed.

=== modified file 'upstart-session/cameraservice-trust-stored.conf'
--- upstart-session/cameraservice-trust-stored.conf	2015-08-25 12:33:04 +0000
+++ upstart-session/cameraservice-trust-stored.conf	2016-07-08 13:58:12 +0000
@@ -1,7 +1,7 @@
 description "CameraService Trust Store Daemon"
 
-start on started dbus and xsession SESSION=ubuntu-touch
-stop on runlevel [06]
+start on (started dbus and xsession SESSION=ubuntu-touch) or indicator-services-start
+stop on (runlevel [06]) or indicator-services-end
 
 respawn
 

=== removed file 'upstart-session/cameraservice-trust-stored.conf.moved'
--- upstart-session/cameraservice-trust-stored.conf.moved	2016-01-14 12:31:52 +0000
+++ upstart-session/cameraservice-trust-stored.conf.moved	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-description "CameraService Trust Store Daemon"
-
-start on started dbus and xsession SESSION=ubuntu-touch
-stop on runlevel [06]
-
-respawn
-
-script
-    timeout=800
-    service_socket=/dev/socket/camera_service/camera_service_to_trust
-    # loop and then exit, if camera service isnt up after 80 sec
-    # it is likely not starting at all (or not there)
-    while [ ! -e $service_socket ]; do
-        sleep 0.1
-        if [ "$timeout" -le 0 ]; then
-            stop; exit 0
-        fi
-        timeout=$(($timeout - 1))
-    done
-
-    # Extra security to make sure the service is bound to the sockec
-    # TODO check if needed by inspection of trust store library / camera service
-    sleep 1
-
-    exec /usr/bin/trust-stored-skeleton \
-        --remote-agent UnixDomainSocketRemoteAgent --endpoint=$service_socket \
-        --local-agent MirAgent \
-        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
-        --for-service CameraService \
-        --with-text-domain CameraService \
-        --store-bus session \
-        --disable-whitelisting=yes
-end script

=== modified file 'upstart-session/pulseaudio-trust-stored.conf'
--- upstart-session/pulseaudio-trust-stored.conf	2015-08-25 12:45:50 +0000
+++ upstart-session/pulseaudio-trust-stored.conf	2016-07-08 13:58:12 +0000
@@ -1,7 +1,7 @@
 description "Pulseaudio Trust Store Daemon"
 
-start on started pulseaudio
-stop on stopped pulseaudio
+start on started pulseaudio or indicator-services-start
+stop on stopped pulseaudio or indicator-services-end
 
 respawn
 

=== removed file 'upstart-session/pulseaudio-trust-stored.conf.moved'
--- upstart-session/pulseaudio-trust-stored.conf.moved	2016-01-14 12:31:52 +0000
+++ upstart-session/pulseaudio-trust-stored.conf.moved	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-description "Pulseaudio Trust Store Daemon"
-
-start on started pulseaudio
-stop on stopped pulseaudio
-
-respawn
-
-script
-    # Extra security until trust-stored handles DBus name owner changes
-    # for the service
-    sleep 2
-
-    exec /usr/bin/trust-stored-skeleton \
-        --remote-agent DBusRemoteAgent --bus=session \
-        --local-agent MirAgent \
-        --trusted-mir-socket=/var/run/user/$(id -u)/mir_socket_trusted \
-        --for-service PulseAudio \
-        --with-text-domain PulseAudio \
-        --store-bus session \
-        --disable-whitelisting=yes
-end script