ofono

Merge lp:~pitti/ofono/systemd into lp:~phablet-team/ofono/ubuntu

  1. systemd
  2. Merge into ubuntu
Proposed by Martin Pitt on 2015-01-12
Status: Merged
Approved by: Martin Pitt on 2015-01-15
Approved revision: 6885
Merged at revision: 6884
Proposed branch: lp:~pitti/ofono/systemd
Merge into: lp:~phablet-team/ofono/ubuntu
Diff against target: 42 lines (+15/-1)
3 files modified
debian/control (+1/-0)
debian/ofono.service (+13/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~pitti/ofono/systemd
Reviewer Review Type Date Requested Status
Tony Espy 2015-01-12 Approve on 2015-01-15
PS Jenkins bot continuous-integration Approve on 2015-01-12
Review via email: mp+246103@code.launchpad.net

Commit Message

Add systemd unit.

Description of the Change

Add systemd unit. See https://blueprints.launchpad.net/ubuntu/+spec/core-1411-systemd-migration and commit message for details.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Tony Espy (awe) wrote :

Looks good to me!

review: Approve
lp:~pitti/ofono/systemd updated on 2015-01-15
6885. By Martin Pitt on 2015-01-15

ofono.service: Add BusName

Martin Pitt (pitti) wrote :

One more refinement as discussed on IRC. Tested again on the desktop with systemd.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-05-29 12:15:34 +0000
3+++ debian/control 2015-01-15 16:07:54 +0000
4@@ -6,6 +6,7 @@
5 Uploaders: Jonny Lamb <jonny@debian.org>, Hector Oron <zumbi@debian.org>, Konstantinos Margaritis <markos@debian.org>
6 Build-Depends: debhelper (>= 9),
7 dh-autoreconf,
8+ dh-systemd,
9 libtool,
10 libglib2.0-dev (>= 2.22),
11 libdbus-glib-1-dev,
12
13=== added file 'debian/ofono.service'
14--- debian/ofono.service 1970-01-01 00:00:00 +0000
15+++ debian/ofono.service 2015-01-15 16:07:54 +0000
16@@ -0,0 +1,13 @@
17+[Unit]
18+Description=oFono Mobile telephony stack
19+Documentation=man:ofonod(8)
20+Requires=dbus.service
21+After=dbus.service
22+
23+[Service]
24+Restart=on-failure
25+BusName=org.ofono
26+ExecStart=/usr/sbin/ofonod -P ril --nodetach
27+
28+[Install]
29+WantedBy=multi-user.target
30
31=== modified file 'debian/rules'
32--- debian/rules 2013-12-23 18:38:54 +0000
33+++ debian/rules 2015-01-15 16:07:54 +0000
34@@ -10,7 +10,7 @@
35 -DG_DISABLE_DEPRECATED
36
37 %:
38- dh $@ --parallel --with=autoreconf
39+ dh $@ --parallel --with=autoreconf,systemd
40
41 override_dh_auto_configure:
42 dh_auto_configure -- --enable-bluetooth --enable-dundee

Subscribers

People subscribed via source and target branches