0001-Allow-using-obexd-without-systemd-in-the-user-session-r2.patch 1.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859
  1. From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
  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. Not all sessions run systemd --user (actually, the majority
  6. doesn't), so the dbus daemon must be able to spawn obexd
  7. directly, and to do so it needs the full path of the daemon.
  8. ---
  9. Makefile.obexd | 4 ++--
  10. obexd/src/org.bluez.obex.service | 4 ----
  11. obexd/src/org.bluez.obex.service.in | 4 ++++
  12. 3 files changed, 6 insertions(+), 6 deletions(-)
  13. delete mode 100644 obexd/src/org.bluez.obex.service
  14. create mode 100644 obexd/src/org.bluez.obex.service.in
  15. diff --git a/Makefile.obexd b/Makefile.obexd
  16. index 3760867..142e7c3 100644
  17. --- a/Makefile.obexd
  18. +++ b/Makefile.obexd
  19. @@ -2,12 +2,12 @@
  20. if SYSTEMD
  21. systemduserunitdir = $(SYSTEMD_USERUNITDIR)
  22. systemduserunit_DATA = obexd/src/obex.service
  23. +endif
  24. dbussessionbusdir = $(DBUS_SESSIONBUSDIR)
  25. dbussessionbus_DATA = obexd/src/org.bluez.obex.service
  26. -endif
  27. -EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
  28. +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
  29. obex_plugindir = $(libdir)/obex/plugins
  30. diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
  31. deleted file mode 100644
  32. index a538088..0000000
  33. --- a/obexd/src/org.bluez.obex.service
  34. +++ /dev/null
  35. @@ -1,4 +0,0 @@
  36. -[D-BUS Service]
  37. -Name=org.bluez.obex
  38. -Exec=/bin/false
  39. -SystemdService=dbus-org.bluez.obex.service
  40. diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
  41. new file mode 100644
  42. index 0000000..9c815f2
  43. --- /dev/null
  44. +++ b/obexd/src/org.bluez.obex.service.in
  45. @@ -0,0 +1,4 @@
  46. +[D-BUS Service]
  47. +Name=org.bluez.obex
  48. +Exec=@pkglibexecdir@/obexd
  49. +SystemdService=dbus-org.bluez.obex.service
  50. --
  51. 1.8.3.1