Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 99ccdbe155028c4c789803a429072675b87d0c3a Mon Sep 17 00:00:00 2001 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 2 | From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org> |
| 3 | Date: Sat, 12 Oct 2013 17:45:25 +0200 |
| 4 | Subject: [PATCH] Allow using obexd without systemd in the user session |
| 5 | |
| 6 | Not all sessions run systemd --user (actually, the majority |
| 7 | doesn't), so the dbus daemon must be able to spawn obexd |
| 8 | directly, and to do so it needs the full path of the daemon. |
| 9 | |
| 10 | Upstream-Status: Denied |
| 11 | |
| 12 | Not accepted by upstream maintainer for being a distro specific |
| 13 | configuration. See thread: |
| 14 | |
| 15 | http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843 |
| 16 | |
| 17 | Signed-off-by: Javier Viguera <javier.viguera@digi.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 19 | --- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 20 | 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 Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 24 | |
| 25 | diff --git a/Makefile.obexd b/Makefile.obexd |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 26 | index c462692..0325f66 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 27 | --- a/Makefile.obexd |
| 28 | +++ b/Makefile.obexd |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 29 | @@ -1,12 +1,12 @@ |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 30 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 42 | if OBEX |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 43 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 44 | diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in |
| 45 | similarity index 76% |
| 46 | rename from obexd/src/org.bluez.obex.service |
| 47 | rename to obexd/src/org.bluez.obex.service.in |
| 48 | index a538088..9c815f2 100644 |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 49 | --- a/obexd/src/org.bluez.obex.service |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 50 | +++ b/obexd/src/org.bluez.obex.service.in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 51 | @@ -1,4 +1,4 @@ |
| 52 | [D-BUS Service] |
| 53 | Name=org.bluez.obex |
| 54 | -Exec=/bin/false |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 55 | +Exec=@libexecdir@/obexd |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 56 | SystemdService=dbus-org.bluez.obex.service |