diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-14 00:49:29 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-14 00:49:29 +0000 |
| commit | e13a5a7590fe4cd454bd524463243a99d94cc9ef (patch) | |
| tree | 991a07f29d2d96e7d1520421a81eb05953c47189 | |
| parent | fa70fc6dfb0912b116aabdd39436a8b0be55123e (diff) | |
Use SDP server included in hcid
| -rw-r--r-- | scripts/bluetooth.default | 4 | ||||
| -rw-r--r-- | scripts/bluetooth.init | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/scripts/bluetooth.default b/scripts/bluetooth.default index 4817d38c..976fa245 100644 --- a/scripts/bluetooth.default +++ b/scripts/bluetooth.default @@ -7,7 +7,7 @@ HCID_ENABLE=true HCID_CONFIG="/etc/bluetooth/hcid.conf" # Start sdpd (allowed values are "true" and "false") -SDPD_ENABLE=true +SDPD_ENABLE=false # Start hidd (allowed values are "true" and "false") HIDD_ENABLE=true @@ -19,7 +19,7 @@ HIDD_OPTIONS="" HID2HCI_ENABLE=true # Bind rfcomm devices (allowed values are "true" and "false") -RFCOMM_ENABLE=true +RFCOMM_ENABLE=false # Config file for rfcomm RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf" diff --git a/scripts/bluetooth.init b/scripts/bluetooth.init index fad223fd..f1bf358f 100644 --- a/scripts/bluetooth.init +++ b/scripts/bluetooth.init @@ -26,10 +26,10 @@ PAND_EXEC="`which $PAND_NAME || true`" DUND_EXEC="`which $DUND_NAME || true`" HCID_ENABLE=true -SDPD_ENABLE=true +SDPD_ENABLE=false HIDD_ENABLE=false HID2HCI_ENABLE=false -RFCOMM_ENABLE=true +RFCOMM_ENABLE=false DUND_ENABLE=false PAND_ENABLE=false @@ -46,7 +46,11 @@ case "$1" in start) echo -n "Starting $DESC:" if $HCID_ENABLE && [ -x "$HCID_EXEC" ] && [ -f "$HCID_CONFIG" ] ; then - $HCID_EXEC -f $HCID_CONFIG + if $SDPD_ENABLE ; then + $HCID_EXEC -f $HCID_CONFIG + else + $HCID_EXEC -s -f $HCID_CONFIG + fi echo -n " $HCID_NAME" fi if $SDPD_ENABLE && [ -x "$SDPD_EXEC" ] ; then |