From f74eb97c9fb3c0ee2895742e773ac6a3c41c999c Mon Sep 17 00:00:00 2001
|
From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
|
Date: Sat, 12 Oct 2013 17:45:25 +0200
|
Subject: [PATCH] Allow using obexd without systemd in the user session
|
|
Not all sessions run systemd --user (actually, the majority
|
doesn't), so the dbus daemon must be able to spawn obexd
|
directly, and to do so it needs the full path of the daemon.
|
|
Upstream-Status: Denied
|
|
Not accepted by upstream maintainer for being a distro specific
|
configuration. See thread:
|
|
http://thread.gmane.org/gmane.linux.bluez.kernel/38725/focus=38843
|
|
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
|
|
---
|
Makefile.obexd | 4 ++--
|
.../src/{org.bluez.obex.service => org.bluez.obex.service.in} | 2 +-
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
rename obexd/src/{org.bluez.obex.service => org.bluez.obex.service.in} (76%)
|
|
diff --git a/Makefile.obexd b/Makefile.obexd
|
index de59d29..73004a3 100644
|
--- a/Makefile.obexd
|
+++ b/Makefile.obexd
|
@@ -1,12 +1,12 @@
|
if SYSTEMD
|
systemduserunitdir = $(SYSTEMD_USERUNITDIR)
|
systemduserunit_DATA = obexd/src/obex.service
|
+endif
|
|
dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
|
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
|
-endif
|
|
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
|
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
|
|
if OBEX
|
|
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service.in
|
similarity index 76%
|
rename from obexd/src/org.bluez.obex.service
|
rename to obexd/src/org.bluez.obex.service.in
|
index a538088..9c815f2 100644
|
--- a/obexd/src/org.bluez.obex.service
|
+++ b/obexd/src/org.bluez.obex.service.in
|
@@ -1,4 +1,4 @@
|
[D-BUS Service]
|
Name=org.bluez.obex
|
-Exec=/bin/false
|
+Exec=@libexecdir@/obexd
|
SystemdService=dbus-org.bluez.obex.service
|
