Linux bluetooth development
 help / color / mirror / Atom feed
* [PATCH] Allow using obexd without systemd in the user session
@ 2013-10-12 15:45 Giovanni Campagna
  2013-10-12 16:08 ` Marcel Holtmann
  0 siblings, 1 reply; 6+ messages in thread
From: Giovanni Campagna @ 2013-10-12 15:45 UTC (permalink / raw)
  To: linux-bluetooth; +Cc: Giovanni Campagna

From: Giovanni Campagna <gcampagna@src.gnome.org>

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.
---
 Makefile.obexd                      | 4 ++--
 obexd/src/org.bluez.obex.service    | 4 ----
 obexd/src/org.bluez.obex.service.in | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 obexd/src/org.bluez.obex.service
 create mode 100644 obexd/src/org.bluez.obex.service.in

diff --git a/Makefile.obexd b/Makefile.obexd
index d5377cb..751e0e5 100644
--- a/Makefile.obexd
+++ b/Makefile.obexd
@@ -2,12 +2,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
 
 obex_plugindir = $(libdir)/obex/plugins
 
diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
deleted file mode 100644
index a538088..0000000
--- a/obexd/src/org.bluez.obex.service
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/bin/false
-SystemdService=dbus-org.bluez.obex.service
diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
new file mode 100644
index 0000000..9c815f2
--- /dev/null
+++ b/obexd/src/org.bluez.obex.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.bluez.obex
+Exec=@libexecdir@/obexd
+SystemdService=dbus-org.bluez.obex.service
-- 
1.8.3.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-10-14 18:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-12 15:45 [PATCH] Allow using obexd without systemd in the user session Giovanni Campagna
2013-10-12 16:08 ` Marcel Holtmann
2013-10-12 16:18   ` Giovanni Campagna
2013-10-12 16:25   ` Bastien Nocera
2013-10-14 15:02     ` Luiz Augusto von Dentz
2013-10-14 18:02       ` Bastien Nocera

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox