diff options
Diffstat (limited to 'extra/bluez/rc.bluetooth')
| -rw-r--r-- | extra/bluez/rc.bluetooth | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/extra/bluez/rc.bluetooth b/extra/bluez/rc.bluetooth index a46ee2abb..0feeaeab6 100644 --- a/extra/bluez/rc.bluetooth +++ b/extra/bluez/rc.bluetooth @@ -21,14 +21,14 @@ DUND_EXEC="/usr/bin/dund" DAEMON_ENABLE="true" HIDD_ENABLE="false" RFCOMM_ENABLE="false" -DUND_ENABLE="false" PAND_ENABLE="false" +DUND_ENABLE="false" RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" HIDD_OPTIONS="" -DUND_OPTIONS="" PAND_OPTIONS="" +DUND_OPTIONS="" [ -f /etc/conf.d/bluetooth ] && . /etc/conf.d/bluetooth @@ -40,10 +40,6 @@ case "$1" in $DAEMON_EXEC sleep 1 fi - if [ "$SDPD_ENABLE" = "true" -a -x "$SDPD_EXEC" ] ; then - stat_append " $SDPD_NAME" - $SDPD_EXEC - fi if [ "$HIDD_ENABLE" = "true" -a -x "$HIDD_EXEC" ]; then stat_append " $HIDD_NAME" $HIDD_EXEC $HIDD_OPTIONS @@ -52,26 +48,26 @@ case "$1" in stat_append " $RFCOMM_NAME" $RFCOMM_EXEC -f $RFCOMM_CONFIG bind all fi - if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then - stat_append " $DUND_NAME" - $DUND_EXEC $DUND_OPTIONS - fi if [ "$PAND_ENABLE" = "true" -a -x "$PAND_EXEC" -a -n "$PAND_OPTIONS" ]; then stat_append " $PAND_NAME" $PAND_EXEC $PAND_OPTIONS fi + if [ "$DUND_ENABLE" = "true" -a -x "$DUND_EXEC" -a -n "$DUND_OPTIONS" ]; then + stat_append " $DUND_NAME" + $DUND_EXEC $DUND_OPTIONS + fi add_daemon bluetooth stat_done ;; stop) stat_busy "Stopping bluetooth subsystem:" - stat_append " $PAND_NAME" - killall $PAND_NAME >/dev/null 2>&1 - stat_append " $DUND_NAME" killall $DUND_NAME >/dev/null 2>&1 + stat_append " $PAND_NAME" + killall $PAND_NAME >/dev/null 2>&1 + if [ -x "$RFCOMM_EXEC" ]; then stat_append " $RFCOMM_NAME" $RFCOMM_EXEC release all >/dev/null 2>&1 @@ -80,9 +76,6 @@ case "$1" in stat_append " $HIDD_NAME" killall $HIDD_NAME >/dev/null 2>&1 - stat_append " $SDPD_NAME" - killall $SDPD_NAME >/dev/null 2>&1 - stat_append " $DAEMON_NAME" killall $DAEMON_NAME >/dev/null 2>&1 |