summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-08-29 00:27:21 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-08-29 00:27:21 +0200
commit6a7d6b44f8577d64d3235cddfdfc1579cd9254d5 (patch)
tree90d66534f171eb478558017d9508de6e380b0d65
parent7f0e81d8223ac0a07d21e50045240cb14964e4dd (diff)
parent6c49baa76eef3b34b6bc83be093d66a3bc4a6af3 (diff)
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
-rw-r--r--scripts/bluetooth.init6
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/bluetooth.init b/scripts/bluetooth.init
index 28b0eb0a..ee12408b 100644
--- a/scripts/bluetooth.init
+++ b/scripts/bluetooth.init
@@ -18,15 +18,13 @@ HID2HCI_EXEC="`which $HID2HCI_NAME || true`"
DAEMON_ENABLE=true
HID2HCI_ENABLE=false
-DAEMON_CONFIG="/etc/bluetooth/hcid.conf"
-
[ -e /etc/default/bluetooth ] && . /etc/default/bluetooth
case "$1" in
start)
echo -n "Starting $DESC:"
- if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ] && [ -f "$DAEMON_CONFIG" ] ; then
- $DAEMON_EXEC -f $DAEMON_CONFIG
+ if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ]; then
+ $DAEMON_EXEC
echo -n " $DAEMON_NAME"
fi
if $HID2HCI_ENABLE && [ -x "$HID2HCI_EXEC" ] ; then