Ubuntu Location Provider Here

Merge lp:~mandel/ubuntu-location-provider-here/move-to-vivid into lp:ubuntu-location-provider-here

  1. move-to-vivid
  2. Merge into trunk
Proposed by Manuel de la Peña on 2015-04-30
Status: Merged
Approved by: Thomas Voß on 2015-05-29
Approved revision: 25
Merged at revision: 24
Proposed branch: lp:~mandel/ubuntu-location-provider-here/move-to-vivid
Merge into: lp:ubuntu-location-provider-here
Diff against target: 45 lines (+18/-13)
1 file modified
etc/init/ubuntu-location-provider-here-after-wizard.conf (+18/-13)
To merge this branch: bzr merge lp:~mandel/ubuntu-location-provider-here/move-to-vivid
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2015-04-30
Ubuntu Phablet Team 2015-04-30 Pending
Review via email: mp+257910@code.launchpad.net

Commit Message

Empty commit to made the changes available for vivid.

Description of the Change

Empty commit to made the changes available for vivid.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~mandel/ubuntu-location-provider-here/move-to-vivid updated on 2015-04-30
24. By Manuel de la Peña on 2015-04-30

Ensure that the processes are started in the correct oder after the wizard.

25. By Manuel de la Peña on 2015-04-30

Use the cascade of the process via upstart jobs.

PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~mandel/ubuntu-location-provider-here/move-to-vivid updated on 2015-06-01
26. By Manuel de la Peña on 2015-06-01

Ensure we stop the service before we try to start it again.

27. By Manuel de la Peña on 2015-06-01

Ensure that is not execute in every boot.

28. By Manuel de la Peña on 2015-06-01

Do a restart, else the boot hangs.

29. By Manuel de la Peña on 2015-06-01

Ensure we run only once.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/init/ubuntu-location-provider-here-after-wizard.conf'
2--- etc/init/ubuntu-location-provider-here-after-wizard.conf 2015-01-27 17:08:51 +0000
3+++ etc/init/ubuntu-location-provider-here-after-wizard.conf 2015-06-01 17:46:22 +0000
4@@ -5,23 +5,28 @@
5 # /var/lib/AccountsService/users/phablet but that's kind of a private path and
6 # it might get updated fairly often (e.g. it contains a sound level)
7 # XXX need to move to session bus to avoid hardcoding this ~phablet test
8-start on started dbus and started ofono and started network-manager and file \
9- FILE=/home/phablet/.config/ubuntu-system-settings/wizard-has-run \
10- EVENT=create
11+start on file FILE=/home/phablet/.config/ubuntu-system-settings/wizard-has-run EVENT=create
12
13 task
14
15 script
16- # starting slpgwd should be enough to trigger the start of posclientd which
17- # will trigger the start of espoo provider
18- start ubuntu-location-provider-here-slpgwd
19- #start ubuntu-location-provider-here-posclientd
20- #start ubuntu-espoo-service
21-
22+ # HACK: the location-service gets busted when we restart it and the other processes are not
23+ # in the correct order. We stop location, start all the other services in the correct order
24+ # and start location again
25 # XXX ugly, we need to restart location-service to pickup the now available provider :-/
26+ if [ -f "/home/phablet/.config/ubuntu-system-settings/wizard-has-run-and-location-job-too" ]; then
27+ stop; exit 0
28+ fi
29+
30 sleep 5
31- restart ubuntu-location-service
32-
33- exit 0
34+
35+ stop ubuntu-location-provider-here-posclientd || true
36+ stop ubuntu-location-provider-here-slpgwd || true
37+ stop ubuntu-location-service || true
38+
39+ start ubuntu-location-provider-here-slpgwd || true
40+ start ubuntu-location-service
41+
42+ touch /home/phablet/.config/ubuntu-system-settings/wizard-has-run-and-location-job-too
43+ stop; exit 0
44 end script
45-

Subscribers

People subscribed via source and target branches