Merge lp:~tiagosh/ubuntu-touch-session/rtm-14.09-fix-1413316 into lp:ubuntu-touch-session/rtm-14.09

Proposed by Tiago Salem Herrmann
Status: Merged
Approved by: Bill Filler
Approved revision: 245
Merged at revision: 246
Proposed branch: lp:~tiagosh/ubuntu-touch-session/rtm-14.09-fix-1413316
Merge into: lp:ubuntu-touch-session/rtm-14.09
Diff against target: 12 lines (+1/-1)
1 file modified
upstart-session/ofono-setup.conf (+1/-1)
To merge this branch: bzr merge lp:~tiagosh/ubuntu-touch-session/rtm-14.09-fix-1413316
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+249230@code.launchpad.net

Commit message

Do not depend on ofono upstart job.

Description of the change

Do not depend on ofono upstart job.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'upstart-session/ofono-setup.conf'
2--- upstart-session/ofono-setup.conf 2014-12-12 16:29:07 +0000
3+++ upstart-session/ofono-setup.conf 2015-02-10 17:45:40 +0000
4@@ -1,7 +1,7 @@
5 description "Setup telepathy accounts when ofono and dbus start"
6 author "Oliver Grawert <ogra@canonical.com>"
7
8-start on (:sys:started JOB=ofono) and (started dbus)
9+start on started dbus
10 stop on desktop-end
11
12 exec /usr/bin/ofono-setup

Subscribers

People subscribed via source and target branches