[Pkg-bluetooth-commits] r1440 - in /packages/bluez/trunk/debian: bluez.bluetooth.default bluez.bluetooth.init

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Fri Jul 25 19:38:41 2014
New Revision: 1440

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1440
Log:
Revert r1410

Modified:
    packages/bluez/trunk/debian/bluez.bluetooth.default
    packages/bluez/trunk/debian/bluez.bluetooth.init

Modified: packages/bluez/trunk/debian/bluez.bluetooth.default
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.bluetooth.default?rev=1440&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.bluetooth.default	(original)
+++ packages/bluez/trunk/debian/bluez.bluetooth.default	Fri Jul 25 19:38:41 2014
@@ -3,6 +3,10 @@
 # start bluetooth on boot?
 # compatibility note: if this variable is _not_ found bluetooth will start
 BLUETOOTH_ENABLED=1
+
+# From bluez 5.x, each HCI device is in invalid state.
+# ACTIVE_HCI_DEVICES_ON_BOOT specifies the HCI device be activated on boot-time.
+ACTIVE_HCI_DEVICES_ON_BOOT="hci0"
 
 # This setting used to switch HID devices (e.g mouse/keyboad) to HCI mode, that
 # is you will have bluetooth functionality from your dongle instead of only

Modified: packages/bluez/trunk/debian/bluez.bluetooth.init
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez.bluetooth.init?rev=1440&op=diff
==============================================================================
--- packages/bluez/trunk/debian/bluez.bluetooth.init	(original)
+++ packages/bluez/trunk/debian/bluez.bluetooth.init	Fri Jul 25 19:38:41 2014
@@ -140,6 +140,30 @@
 	fi
 }
 
+start_hci_dev()
+{
+	if [ -z "$ACTIVE_HCI_DEVICES_ON_BOOT" ]; then
+		log_daemon_msg "Please set to the bluetooth host device you to enable."
+		log_daemon_msg "Please see /etc/default/bluetooth."
+		log_progress_msg "No enable hci device"
+		return
+	fi
+
+	for dev in ${ACTIVE_HCI_DEVICES_ON_BOOT} ; do
+		# NOTE: use dbus.... / hci0
+		# dbus-send --system --type=method_call
+		#   --print-reply=literal dest=org.bluez /org/bluez/hci0 \
+		#   org.freedesktop.DBus.Properties.Set:org.bluez.Adapter1 \
+		#   string:Powered variant:boolean:true
+		if [ "$VERBOSE" != no ]; then
+			log_progress_msg "Enabled ${dev}"
+			hciconfig $dev up || :
+		else
+			hciconfig $dev up > /dev/null 2>&1 || :
+		fi
+	done
+}
+
 case $1 in
   start)
 	log_daemon_msg "Starting $DESC"
@@ -149,6 +173,9 @@
 		log_end_msg 0
 		exit 0
 	fi
+
+	# start HCI devices
+	start_hci_dev || :
 
 	start-stop-daemon --start --background $SSD_OPTIONS
 	log_progress_msg "${DAEMON##*/}"