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

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  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. @@ -1,12 +1,13 @@
  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. +
  29. +EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
  30. if OBEX
  31. diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
  32. deleted file mode 100644
  33. index a538088..0000000
  34. --- a/obexd/src/org.bluez.obex.service
  35. +++ /dev/null
  36. @@ -1,4 +0,0 @@
  37. -[D-BUS Service]
  38. -Name=org.bluez.obex
  39. -Exec=/bin/false
  40. -SystemdService=dbus-org.bluez.obex.service
  41. diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
  42. new file mode 100644
  43. index 0000000..9c815f2
  44. --- /dev/null
  45. +++ b/obexd/src/org.bluez.obex.service.in
  46. @@ -0,0 +1,4 @@
  47. +[D-BUS Service]
  48. +Name=org.bluez.obex
  49. +Exec=@libexecdir@/obexd
  50. +SystemdService=dbus-org.bluez.obex.service
  51. --
  52. 1.8.3.1