Author: gotar Date: Mon Apr 13 22:18:15 2009 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- no more hcid binary: remove start/stop parts, reload bluetoothd (kills it
anyway), updated status (no more sdpd either, check for pand)
---- Files affected:
SOURCES:
bluez.init (1.3 -> 1.4)
---- Diffs:
================================================================
Index: SOURCES/bluez.init
diff -u SOURCES/bluez.init:1.3 SOURCES/bluez.init:1.4
--- SOURCES/bluez.init:1.3 Mon Oct 20 19:09:32 2008
+++ SOURCES/bluez.init Tue Apr 14 00:18:09 2009
@@ -30,22 +30,11 @@
if is_yes "${HID2HCI_ENABLE}" && [ -x /usr/sbin/hid2hci ]; then
msg_starting hid2hci
- daemon /usr/sbin/hid2hci -0 -q #be quiet
+ 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
- HCID_FLAGS="-f /etc/bluetooth/hcid.conf"
-
- if is_yes "${SDPD_ENABLE}" ; then
- HCID_FLAGS="$HCID_FLAGS -s"
- fi
- msg_starting hcid
- daemon /usr/sbin/hcid $HCID_FLAGS
- RETVAL=$?
- fi
-
+
if is_yes "${HIDD_ENABLE}" && [ -x /usr/bin/hidd ]; then
msg_starting hidd
daemon /usr/bin/hidd ${HIDD_OPTIONS} --server
@@ -57,13 +46,13 @@
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}
@@ -98,15 +87,10 @@
daemon /usr/bin/rfcomm release all
fi
- if is_yes "${HIDD_ENABLE}" && [ -x /usr/bin/hidd ]; then
+ if is_yes "${HIDD_ENABLE}" && [ -x /usr/bin/hidd ]; then
msg_stopping hidd
killproc /usr/bin/hidd
fi
-
- if is_yes "${HCID_ENABLE}" && [ -x /usr/sbin/hcid ]; then
- msg_stopping hcid
- killproc /usr/sbin/hcid
- fi
if is_yes "${DAEMON_ENABLE}" && [ -x /usr/sbin/bluetoothd ];
then
msg_stopping bluetooth
@@ -136,10 +120,10 @@
# See how we were called.
case "$1" in
start)
- start
+ start
;;
stop)
- stop
+ stop
;;
restart)
stop
@@ -150,8 +134,8 @@
;;
reload|force-reload)
if [ -f /var/lock/subsys/bluetooth ]; then
- msg_reloading hcid
- killproc hcid -HUP
+ msg_reloading bluetoothd
+ killproc bluetoothd -HUP
RETVAL=$?
else
msg_not_running bluetooth
@@ -160,15 +144,15 @@
;;
status)
is_yes "${HID2HCI_ENABLE}" && status hid2hci
- is_yes "${HCID_ENABLE}" && status hcid
- is_yes "${SDPD_ENABLE}" && status sdpd
+ is_yes "${HCID_ENABLE}" && status bluetoothd
is_yes "${HIDD_ENABLE}" && status hidd
is_yes "${DUND_ENABLE}" && status dund
+ is_yes "${PAND_ENABLE}" && status pand
if [ -f /var/lock/subsys/bluetooth ]; then
exit 0
else
exit 1
- fi
+ fi
;;
*)
msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/bluez.init?r1=1.3&r2=1.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
