From 9373a11b4a5e94520f914e4b4c021470e82aff86 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 6 Aug 2013 16:33:21 +0300
Subject: [PATCH] obexd: start via initscript

---
 .../bluez/config/org.bluez.obex.service       |  5 --
 packages/network/bluez/init.d/55_obexd        | 46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 5 deletions(-)
 delete mode 100644 packages/network/bluez/config/org.bluez.obex.service
 create mode 100644 packages/network/bluez/init.d/55_obexd

diff --git a/packages/network/bluez/config/org.bluez.obex.service b/packages/network/bluez/config/org.bluez.obex.service
deleted file mode 100644
index 4a34bd8b76..0000000000
--- a/packages/network/bluez/config/org.bluez.obex.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[D-BUS Service]
-Name=org.bluez.obex
-Exec=/usr/lib/bluetooth/obexd -r /storage/downloads
-User=root
-
diff --git a/packages/network/bluez/init.d/55_obexd b/packages/network/bluez/init.d/55_obexd
new file mode 100644
index 0000000000..cd1995c6ce
--- /dev/null
+++ b/packages/network/bluez/init.d/55_obexd
@@ -0,0 +1,46 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+#
+# start obexd
+#
+# runlevels: openelec, textmode
+
+(
+  # can be called from openelec addon.
+  # ensure that environment is sane
+  . /etc/profile
+
+  if [ "$DEBUG" = "yes" ]; then
+    OBEXD_DEBUG="-d"
+  fi
+
+  OBEXD_ENABLED=true
+  OBEXD_ROOT=/storage/downloads
+  if [ -f $CONFIG_CACHE/service_bluez.conf ]; then
+    . $CONFIG_CACHE/service_bluez.conf
+  fi
+
+  if [ "$BLUEZ_ENABLED" == "true" -a "$OBEXD_ENABLED" == "true" ]; then
+    progress "Starting obexd"
+    wait_for_dbus
+    /usr/lib/bluetooth/obexd $OBEXD_DEBUG -r "$OBEXD_ROOT" &>/dev/null
+  fi
+)&