blob: da7140922d9d3c8d5e0750657cee1fb7bfd90cc2 [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001
Patrick Williamsd8c66bc2016-06-20 12:57:21 -05002From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
3Date: Sat, 12 Oct 2013 17:45:25 +0200
4Subject: [PATCH] Allow using obexd without systemd in the user session
5
6Not all sessions run systemd --user (actually, the majority
7doesn't), so the dbus daemon must be able to spawn obexd
8directly, and to do so it needs the full path of the daemon.
9
10Upstream-Status: Denied
11
12Not accepted by upstream maintainer for being a distro specific
13configuration. See thread:
14
15http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
16
17Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050019---
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020 Makefile.obexd | 4 ++--
21 obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
22 2 files changed, 3 insertions(+), 3 deletions(-)
23 rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050024
25diff --git a/Makefile.obexd b/Makefile.obexd
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080026index c462692..0325f66 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050027--- a/Makefile.obexd
28+++ b/Makefile.obexd
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080029@@ -1,12 +1,12 @@
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050030 if SYSTEMD
31 systemduserunitdir = @SYSTEMD_USERUNITDIR@
32 systemduserunit_DATA = obexd/src/obex.service
33+endif
34
35 dbussessionbusdir = @DBUS_SESSIONBUSDIR@
36 dbussessionbus_DATA = obexd/src/org.bluez.obex.service
37-endif
38
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
41
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080042 if OBEX
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050043
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080044diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
45similarity index 76%
46rename from obexd/src/org.bluez.obex.service
47rename to obexd/src/org.bluez.obex.service.in
48index a538088..9c815f2 100644
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050049--- a/obexd/src/org.bluez.obex.service
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050050+++ b/obexd/src/org.bluez.obex.service.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080051@@ -1,4 +1,4 @@
52 [D-BUS Service]
53 Name=org.bluez.obex
54-Exec=/bin/false
Patrick Williamsd8c66bc2016-06-20 12:57:21 -050055+Exec=@libexecdir@/obexd
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080056 SystemdService=dbus-org.bluez.obex.service