1 From 0080ce8a37152b0ee7750799e01de3bf810f8caf Mon Sep 17 00:00:00 2001
2 From: Lennart Poettering <lennart@poettering.net>
3 Date: Wed, 21 Jul 2010 19:20:44 +0200
4 Subject: [PATCH] systemd: install systemd unit files
6 This also enables bus activation for bluetoothd, but only if systemd is
7 running. Only if that's the case we can make sure in a race-free fashion
8 that bluetoothd is not started twice at the same time.
10 Makefile.am | 21 ++++++++++++++++++---
11 configure.ac | 9 +++++++++
12 scripts/.gitignore | 1 +
13 scripts/bluetooth.service.in | 13 +++++++++++++
14 scripts/org.bluez.service | 5 +++++
15 5 files changed, 46 insertions(+), 3 deletions(-)
16 create mode 100644 scripts/.gitignore
17 create mode 100644 scripts/bluetooth.service.in
18 create mode 100644 scripts/org.bluez.service
20 diff --git a/Makefile.am b/Makefile.am
21 index aecc8f2..6e18003 100644
24 @@ -387,10 +387,25 @@ endif
25 rules_DATA = $(foreach file,$(udev_files), scripts/97-$(notdir $(file)))
29 +systemdsystemunit_DATA = \
30 + scripts/bluetooth.service
32 +scripts/bluetooth.service: scripts/bluetooth.service.in
33 + @$(SED) -e "s|\@sbindir\@|$(sbindir)|" $< >$@
35 +dbussystemservicesdir = $(datadir)/dbus-1/system-services
37 +dbussystemservices_DATA = \
38 + scripts/org.bluez.service
42 CLEANFILES += $(rules_DATA)
44 EXTRA_DIST += scripts/bluetooth.rules \
45 - scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
46 + scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
47 + scripts/bluetooth.service.in scripts/org.bluez.service
49 EXTRA_DIST += doc/manager-api.txt \
50 doc/adapter-api.txt doc/device-api.txt \
51 @@ -417,9 +432,9 @@ pkgconfigdir = $(libdir)/pkgconfig
53 pkgconfig_DATA = bluez.pc
55 -DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles
56 +DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles --with-systemdsystemunitdir=
58 -DISTCLEANFILES = $(pkgconfig_DATA)
59 +DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service
61 MAINTAINERCLEANFILES = Makefile.in \
62 aclocal.m4 configure config.h.in config.sub config.guess \
63 diff --git a/configure.ac b/configure.ac
64 index bc2658c..b4502ab 100644
67 @@ -71,5 +71,14 @@ if (test -n "${path_systemdunit}"); then
69 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
73 +AC_ARG_WITH([systemdsystemunitdir],
74 + AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
76 + [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
77 +AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
78 +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
80 AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
81 src/bluetoothd.8 src/bluetooth.service bluez.pc)
82 diff --git a/scripts/.gitignore b/scripts/.gitignore
84 index 0000000..4b9f765
86 +++ b/scripts/.gitignore
89 diff --git a/scripts/bluetooth.service.in b/scripts/bluetooth.service.in
91 index 0000000..d0089ea
93 +++ b/scripts/bluetooth.service.in
96 +Description=Bluetooth Manager
102 +ExecStart=@sbindir@/bluetoothd -n
103 +StandardOutput=syslog
106 +WantedBy=bluetooth.target
107 +Alias=dbus-org.bluez.service
108 diff --git a/scripts/org.bluez.service b/scripts/org.bluez.service
110 index 0000000..dd7ae8f
112 +++ b/scripts/org.bluez.service
118 +SystemdService=dbus-org.bluez.service