From 40622b2cea1dabef6c77438771e9af6e1e023f33 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Wed, 26 Sep 2018 12:10:12 +0400
Subject: [PATCH] bluez: default enable bluetooth services

---
 packages/network/bluez/default.d/bluez.conf           |  0
 packages/network/bluez/package.mk                     |  4 ++++
 .../network/bluez/system.d/bluetooth-defaults.service | 11 +++++++++++
 packages/network/bluez/system.d/bluetooth.service     |  3 ++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 packages/network/bluez/default.d/bluez.conf
 create mode 100644 packages/network/bluez/system.d/bluetooth-defaults.service

diff --git a/packages/network/bluez/default.d/bluez.conf b/packages/network/bluez/default.d/bluez.conf
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/network/bluez/package.mk b/packages/network/bluez/package.mk
index 584b4f46e3..5f21f5d8dc 100644
--- a/packages/network/bluez/package.mk
+++ b/packages/network/bluez/package.mk
@@ -56,9 +56,13 @@ post_makeinstall_target() {
     sed -i $INSTALL/etc/bluetooth/main.conf \
         -e "s|^#\[Policy\]|\[Policy\]|g" \
         -e "s|^#AutoEnable.*|AutoEnable=true|g"
+
+  mkdir -p $INSTALL/usr/share/services
+    cp -P $PKG_DIR/default.d/*.conf $INSTALL/usr/share/services
 }
 
 post_install() {
+  enable_service bluetooth-defaults.service
   enable_service bluetooth.service
   enable_service obex.service
 }
diff --git a/packages/network/bluez/system.d/bluetooth-defaults.service b/packages/network/bluez/system.d/bluetooth-defaults.service
new file mode 100644
index 0000000000..7d751631ef
--- /dev/null
+++ b/packages/network/bluez/system.d/bluetooth-defaults.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Bluetooth defaults
+After=local-fs.target
+
+ConditionPathExists=!/storage/.cache/services/bluez.conf
+ConditionPathExists=!/storage/.cache/services/bluez.disabled
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c 'cp /usr/share/services/bluez.conf /storage/.cache/services/'
+RemainAfterExit=yes
diff --git a/packages/network/bluez/system.d/bluetooth.service b/packages/network/bluez/system.d/bluetooth.service
index d3514531fa..4a63139443 100644
--- a/packages/network/bluez/system.d/bluetooth.service
+++ b/packages/network/bluez/system.d/bluetooth.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Bluetooth service
-Requires=bluetooth.target
+After=syslog.target bluetooth-defaults.service
+Requires=bluetooth-defaults.service
 
 ConditionPathExists=/storage/.cache/services/bluez.conf