1 From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
2 Date: Sat, 12 Oct 2013 17:45:25 +0200
3 Subject: [PATCH] Allow using obexd without systemd in the user session
5 Not all sessions run systemd --user (actually, the majority
6 doesn't), so the dbus daemon must be able to spawn obexd
7 directly, and to do so it needs the full path of the daemon.
9 Upstream-Status: Denied
11 Not accepted by upstream maintainer for being a distro specific
12 configuration. See thread:
14 http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
16 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
18 Makefile.obexd | 4 ++--
19 obexd/src/org.bluez.obex.service | 4 ----
20 obexd/src/org.bluez.obex.service.in | 4 ++++
21 3 files changed, 6 insertions(+), 6 deletions(-)
22 delete mode 100644 obexd/src/org.bluez.obex.service
23 create mode 100644 obexd/src/org.bluez.obex.service.in
25 diff --git a/Makefile.obexd b/Makefile.obexd
26 index 2e33cbc72f2b..d5d858c857b4 100644
31 systemduserunitdir = @SYSTEMD_USERUNITDIR@
32 systemduserunit_DATA = obexd/src/obex.service
35 dbussessionbusdir = @DBUS_SESSIONBUSDIR@
36 dbussessionbus_DATA = obexd/src/org.bluez.obex.service
39 -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
40 +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
42 obex_plugindir = $(libdir)/obex/plugins
44 diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
45 deleted file mode 100644
46 index a53808884554..000000000000
47 --- a/obexd/src/org.bluez.obex.service
53 -SystemdService=dbus-org.bluez.obex.service
54 diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
56 index 000000000000..9c815f246b77
58 +++ b/obexd/src/org.bluez.obex.service.in
62 +Exec=@libexecdir@/obexd
63 +SystemdService=dbus-org.bluez.obex.service