|
 |
2b7b48 |
From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
|
|
|
2b7b48 |
From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
|
|
|
2b7b48 |
Date: Sat, 12 Oct 2013 17:45:25 +0200
|
|
|
2b7b48 |
Subject: [PATCH] Allow using obexd without systemd in the user session
|
|
|
2b7b48 |
|
|
|
2b7b48 |
Not all sessions run systemd --user (actually, the majority
|
|
|
2b7b48 |
doesn't), so the dbus daemon must be able to spawn obexd
|
|
|
2b7b48 |
directly, and to do so it needs the full path of the daemon.
|
|
|
2b7b48 |
---
|
|
|
2b7b48 |
Makefile.obexd | 4 ++--
|
|
|
2b7b48 |
obexd/src/org.bluez.obex.service | 4 ----
|
|
|
2b7b48 |
obexd/src/org.bluez.obex.service.in | 4 ++++
|
|
|
2b7b48 |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
2b7b48 |
delete mode 100644 obexd/src/org.bluez.obex.service
|
|
|
2b7b48 |
create mode 100644 obexd/src/org.bluez.obex.service.in
|
|
|
2b7b48 |
|
|
|
2b7b48 |
diff --git a/Makefile.obexd b/Makefile.obexd
|
|
|
2b7b48 |
index 3760867..142e7c3 100644
|
|
|
2b7b48 |
--- a/Makefile.obexd
|
|
|
2b7b48 |
+++ b/Makefile.obexd
|
|
|
2b7b48 |
@@ -2,12 +2,12 @@
|
|
|
2b7b48 |
if SYSTEMD
|
|
|
2b7b48 |
systemduserunitdir = @SYSTEMD_USERUNITDIR@
|
|
|
2b7b48 |
systemduserunit_DATA = obexd/src/obex.service
|
|
|
2b7b48 |
+endif
|
|
|
2b7b48 |
|
|
|
2b7b48 |
dbussessionbusdir = @DBUS_SESSIONBUSDIR@
|
|
|
2b7b48 |
dbussessionbus_DATA = obexd/src/org.bluez.obex.service
|
|
|
2b7b48 |
-endif
|
|
|
2b7b48 |
|
|
|
2b7b48 |
-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
|
|
|
2b7b48 |
+EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
|
|
|
2b7b48 |
|
|
|
2b7b48 |
obex_plugindir = $(libdir)/obex/plugins
|
|
|
2b7b48 |
|
|
|
2b7b48 |
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
|
|
|
2b7b48 |
deleted file mode 100644
|
|
|
2b7b48 |
index a538088..0000000
|
|
|
2b7b48 |
--- a/obexd/src/org.bluez.obex.service
|
|
|
2b7b48 |
+++ /dev/null
|
|
|
2b7b48 |
@@ -1,4 +0,0 @@
|
|
|
2b7b48 |
-[D-BUS Service]
|
|
|
2b7b48 |
-Name=org.bluez.obex
|
|
|
2b7b48 |
-Exec=/bin/false
|
|
|
2b7b48 |
-SystemdService=dbus-org.bluez.obex.service
|
|
|
2b7b48 |
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
|
|
|
2b7b48 |
new file mode 100644
|
|
|
2b7b48 |
index 0000000..9c815f2
|
|
|
2b7b48 |
--- /dev/null
|
|
|
2b7b48 |
+++ b/obexd/src/org.bluez.obex.service.in
|
|
|
2b7b48 |
@@ -0,0 +1,4 @@
|
|
|
2b7b48 |
+[D-BUS Service]
|
|
|
2b7b48 |
+Name=org.bluez.obex
|
|
|
2b7b48 |
+Exec=@libexecdir@/obexd
|
|
|
2b7b48 |
+SystemdService=dbus-org.bluez.obex.service
|
|
|
2b7b48 |
--
|
|
|
2b7b48 |
1.8.3.1
|
|
|
2b7b48 |
|