Attachment 4921 Details for Bug 25563 – 0001-systemd-install-systemd-unit-files.patch

[patch] 0001-systemd-install-systemd-unit-files.patch

0001-systemd-install-systemd-unit-files.patch (text/plain), 3.79 KB, created by Alexey Shabalin on 2011-05-04 20:34:13 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Alexey Shabalin

Created: 2011-05-04 20:34:13 MSK

Size: 3.79 KB

patch

obsolete

>From 22c938523708fab4afa67608461c103a663fd21c Mon Sep 17 00:00:00 2001
>From: Lennart Poettering <lennart@poettering.net>
>Date: Wed, 21 Jul 2010 19:20:44 +0200
>Subject: [PATCH] systemd: install systemd unit files
>
>This also enables bus activation for bluetoothd, but only if systemd is
>running. Only if that's the case we can make sure in a race-free fashion
>that bluetoothd is not started twice at the same time.
>---
> Makefile.am                  |   21 ++++++++++++++++++---
> configure.ac                 |    9 +++++++++
> scripts/.gitignore           |    1 +
> scripts/bluetooth.service.in |   13 +++++++++++++
> scripts/org.bluez.service    |    5 +++++
> 5 files changed, 46 insertions(+), 3 deletions(-)
> create mode 100644 scripts/.gitignore
> create mode 100644 scripts/bluetooth.service.in
> create mode 100644 scripts/org.bluez.service
>
>diff --git a/Makefile.am b/Makefile.am
>index 4670886..8a844bf 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -352,7 +352,8 @@ endif
> CLEANFILES += $(rules_DATA)
> 
> EXTRA_DIST += scripts/bluetooth.rules \
>-		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
>+		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules \
>+		scripts/bluetooth.service.in scripts/org.bluez.service
> 
> if PCMCIA
> udevdir = $(libexecdir)/udev
>@@ -360,6 +361,20 @@ udevdir = $(libexecdir)/udev
> dist_udev_SCRIPTS = scripts/bluetooth_serial
> endif
> 
>+if HAVE_SYSTEMD
>+systemdsystemunit_DATA = \
>+       scripts/bluetooth.service
>+
>+scripts/bluetooth.service: scripts/bluetooth.service.in
>+	@$(SED) -e "s|\@sbindir\@|$(sbindir)|" $< >$@
>+
>+dbussystemservicesdir = $(datadir)/dbus-1/system-services
>+
>+dbussystemservices_DATA = \
>+	scripts/org.bluez.service
>+
>+endif
>+
> EXTRA_DIST += doc/manager-api.txt \
> 		doc/adapter-api.txt doc/device-api.txt \
> 		doc/service-api.txt doc/agent-api.txt doc/attribute-api.txt \
>@@ -385,9 +400,9 @@ pkgconfigdir = $(libdir)/pkgconfig
> 
> pkgconfig_DATA = bluez.pc
> 
>-DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib
>+DISTCHECK_CONFIGURE_FLAGS = --disable-udevrules --enable-attrib --with-systemdsystemunitdir=
> 
>-DISTCLEANFILES = $(pkgconfig_DATA)
>+DISTCLEANFILES = $(pkgconfig_DATA) scripts/bluetooth.service
> 
> MAINTAINERCLEANFILES = Makefile.in \
> 	aclocal.m4 configure config.h.in config.sub config.guess \
>diff --git a/configure.ac b/configure.ac
>index 1ecdc7b..ddb62ed 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -56,5 +56,14 @@ if (test "${enable_capng}" = "yes"); then
> 	AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
> fi
> 
>+# systemd
>+
>+AC_ARG_WITH([systemdsystemunitdir],
>+	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
>+	[],
>+	[with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
>+AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
>+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
>+
> AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
> 					src/bluetoothd.8 bluez.pc)
>diff --git a/scripts/.gitignore b/scripts/.gitignore
>new file mode 100644
>index 0000000..4b9f765
>--- /dev/null
>+++ b/scripts/.gitignore
>@@ -0,0 +1 @@
>+bluetooth.service
>diff --git a/scripts/bluetooth.service.in b/scripts/bluetooth.service.in
>new file mode 100644
>index 0000000..d0089ea
>--- /dev/null
>+++ b/scripts/bluetooth.service.in
>@@ -0,0 +1,13 @@
>+[Unit]
>+Description=Bluetooth Manager
>+After=syslog.target
>+
>+[Service]
>+Type=dbus
>+BusName=org.bluez
>+ExecStart=@sbindir@/bluetoothd -n
>+StandardOutput=syslog
>+
>+[Install]
>+WantedBy=bluetooth.target
>+Alias=dbus-org.bluez.service
>diff --git a/scripts/org.bluez.service b/scripts/org.bluez.service
>new file mode 100644
>index 0000000..dd7ae8f
>--- /dev/null
>+++ b/scripts/org.bluez.service
>@@ -0,0 +1,5 @@
>+[D-BUS Service]
>+Name=org.bluez
>+Exec=/bin/false
>+User=root
>+SystemdService=dbus-org.bluez.service
>-- 
>1.7.4.1
>

Actions: View | Diff

Attachments on bug 25563: 4921