SOURCES: bluez-utils.init, bluez-utils.sysconfig - updated; simple...

[arekm]

Author: arekm                        Date: Fri Apr 28 18:38:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated; simpler; less magic; run more daemons if needed

---- Files affected:
SOURCES:
   bluez-utils.init (1.8 -> 1.9) , bluez-utils.sysconfig (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/bluez-utils.init
diff -u SOURCES/bluez-utils.init:1.8 SOURCES/bluez-utils.init:1.9
--- SOURCES/bluez-utils.init:1.8	Thu Dec  8 02:02:49 2005
+++ SOURCES/bluez-utils.init	Fri Apr 28 20:38:39 2006
@@ -25,46 +25,98 @@
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/bluetooth ]; then
-		msg_starting Bluetooth
+		msg_starting bluetooth; started
+		if is_yes "${HID2HCI_ENABLE}" && [ -x /usr/sbin/hid2hci ]; then
+			msg_starting hid2hci
+			daemon /usr/sbin/hid2hci -0 -q    #be quiet
+			RETVAL=$?
+			/bin/sleep 1 # delay for hid's to be detected by hotplug
+		fi
+		
+		if is_yes "${HCID_ENABLE}" && [ -x /usr/sbin/hcid ]; then
+			msg_starting hcid
+			daemon /usr/sbin/hcid -f /etc/bluetooth/hcid.conf
+			RETVAL=$?
+		fi
+	
+		if is_yes "${SDPD_ENABLE}" && [ -x /usr/sbin/sdpd ]; then
+			msg_starting sdpd
+			daemon /usr/sbin/sdpd
+			RETVAL=$?
+		fi
+		
+		if is_yes "${HIDD_ENABLE}" && [ -x /usr/bin/hidd ]; then
+			msg_starting hidd
+			daemon /usr/bin/hidd ${HIDD_OPTIONS} --server
+			RETVAL=$?
+		fi
+
+		if is_yes "${RFCOMM_ENABLE}" && [ -x /usr/bin/rfcomm ]; then
+			msg_starting rfcomm
+			daemon /usr/bin/rfcomm -f /etc/bluetooth/rfcomm.conf bind all
+			RETVAL=$?
+		fi
+	
+		if is_yes "${DUND_ENABLE}" && [ -x /usr/bin/dund ]; then
+			msg_starting dund
+			daemon /usr/bin/dund ${DUND_OPTIONS}
+			RETVAL=$?
+		fi
+	
+		if is_yes "${PAND_ENABLE}" && [ -x /usr/bin/pand ]; then
+			msg_starting pand
+			daemon /usr/bin/pand ${PAND_OPTIONS}
+			RETVAL=$?
+		fi
+
 		if [ -f /usr/sbin/hciattach -a "$UART_CONF" != "no" ]; then
 			grep -v '^#' $UART_CONF | while read i; do
 				/usr/sbin/hciattach $i
 			done
 		fi
-		daemon /usr/sbin/hcid -f /etc/bluetooth/hcid.conf
-		RETVAL=$?
-		if [ $RETVAL -ne 0 ]; then
-			killproc hciattach >/dev/null 2>&1
-		elif [ -x /usr/sbin/sdpd ]; then
-			msg_starting "Bluetooth SDP"
-			daemon /usr/sbin/sdpd
-			RETVAL=$?
-			if [ $RETVAL -ne 0 ]; then
-				killproc hcid >/dev/null 2>&1
-				if [ "$UART_CONF" != "no" ]; then
-					killproc hciattach >/dev/null 2>&1
-				fi
-			fi
-		fi
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bluetooth
 	else
-		msg_already_running Bluetooth
+		msg_already_running bluetooth
 	fi
 	;;
   stop)
 	if [ -f /var/lock/subsys/bluetooth ]; then
-		if [ -x /usr/sbin/sdpd ]; then
-			msg_stopping "Bluetooth SDP"
-			killproc sdpd
+		if is_yes "${PAND_ENABLE}" && [ -x /usr/bin/pand ]; then
+			msg_stopping pand
+			killproc /usr/bin/pand
+		fi
+
+		if is_yes "${DUND_ENABLE}" && [ -x /usr/bin/dund ]; then
+			msg_stopping dund
+			killproc /usr/bin/dund
+		fi
+
+		if is_yes "${RFCOMM_ENABLE}" && [ -x /usr/bin/rfcomm ]; then
+			msg_stopping rfcomm
+			daemon /usr/bin/rfcomm release all
+		fi
+
+		if is_yes "${HIDD_ENABLE}" && [ -x  /usr/bin/hidd ]; then
+			msg_stopping hidd
+			killproc /usr/bin/hidd
+		fi
+	
+		if is_yes "${SDPD_ENABLE}" && [ -x /usr/sbin/sdpd ]; then
+			msg_stopping sdpd
+			killproc /usr/sbin/sdpd
+		fi
+	
+		if is_yes "${HCID_ENABLE}" && [ -x /usr/sbin/hcid ]; then
+			msg_stopping hcid
+			daemon /usr/sbin/hcid
 		fi
-		msg_stopping Bluetooth
-		killproc hcid
+
 		if [ "$UART_CONF" != "no" ]; then
 			killproc hciattach >/dev/null 2>&1
 		fi
 		rm -f /var/lock/subsys/bluetooth
 	else
-		msg_not_running Bluetooth
+		msg_not_running bluetooth
 	fi
 	;;
   restart)
@@ -74,16 +126,20 @@
 	;;
   reload|force-reload)
 	if [ -f /var/lock/subsys/bluetooth ]; then
-		msg_reloading Bluetooth
+		msg_reloading hcid
 		killproc hcid -HUP
 		RETVAL=$?
 	else
-		msg_not_running Bluetooth >&2
+		msg_not_running bluetooth >&2
 		exit 7
 	fi
 	;;
   status)
-	status hcid
+	is_yes "${HID2HCI_ENABLE}" && status hid2hci
+	is_yes "${HCID_ENABLE}" && status hcid
+	is_yes "${SDPD_ENABLE}" && status sdpd
+	is_yes "${HIDD_ENABLE}" && status hidd
+	is_yes "${DUND_ENABLE}" && status dund
 	exit $?
 	;;
   *)

================================================================
Index: SOURCES/bluez-utils.sysconfig
diff -u SOURCES/bluez-utils.sysconfig:1.1 SOURCES/bluez-utils.sysconfig:1.2
--- SOURCES/bluez-utils.sysconfig:1.1	Wed Apr 16 17:02:14 2003
+++ SOURCES/bluez-utils.sysconfig	Fri Apr 28 20:38:39 2006
@@ -6,3 +6,14 @@
 # remove if you have serial Bluetooth dongles configured in /etc/bluetooth/uart
 # (alternatively you can pass uart configuration file path here)
 UART_CONF="no"
+
+#HID2HCI_ENABLE=yes
+HCID_ENABLE=yes
+SDPD_ENABLE=yes
+HIDD_ENABLE=yes
+#HIDD_OPTIONS=""
+RFCOMM_ENABLE=yes
+#DUND_ENABLE=yes
+#DUND_OPTIONS=""
+#PAND_ENABLE=yes
+#PAND_OPTIONS=""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bluez-utils.init?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SOURCES/bluez-utils.sysconfig?r1=1.1&r2=1.2&f=u