From 062a2f295d5ff5d5536ce2426dbd7259b089f562 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sat, 30 Aug 2008 22:10:57 +0000 Subject: [PATCH 1/1] bluez-utils: sdpd is no longer a separate daemon. SVN-Revision: 12442 --- utils/bluez-utils/Makefile | 2 +- utils/bluez-utils/files/bluetooth.conf | 3 --- utils/bluez-utils/files/bluez-utils.init | 11 ----------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/utils/bluez-utils/Makefile b/utils/bluez-utils/Makefile index 09e1f67f27..3c002dcb90 100644 --- a/utils/bluez-utils/Makefile +++ b/utils/bluez-utils/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bluez-utils PKG_VERSION:=3.36 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://bluez.sourceforge.net/download diff --git a/utils/bluez-utils/files/bluetooth.conf b/utils/bluez-utils/files/bluetooth.conf index ef55446070..54dcec0086 100644 --- a/utils/bluez-utils/files/bluetooth.conf +++ b/utils/bluez-utils/files/bluetooth.conf @@ -2,9 +2,6 @@ config hcid # option config /etc/bluetooth/hcid.conf option enabled 1 -config sdpd - option enabled 0 - config rfcomm # option config /etc/bluetooth/rfcomm.conf option enabled 0 diff --git a/utils/bluez-utils/files/bluez-utils.init b/utils/bluez-utils/files/bluez-utils.init index 1a3227a693..43780f5e8a 100644 --- a/utils/bluez-utils/files/bluez-utils.init +++ b/utils/bluez-utils/files/bluez-utils.init @@ -31,15 +31,6 @@ hcid_config() { [ "$enabled" -gt 0 ] && /usr/sbin/hcid $args } -sdpd_config() { - local cfg="$1" - args="" - append_bool "$cfg" nodaemon "-n" - append_bool "$cfg" something "-m" - config_get_bool enabled "$cfg" "enabled" '1' - [ "$enabled" -gt 0 ] && /usr/sbin/sdpd $args -} - rfcomm_config() { local cfg="$1" args="" @@ -104,7 +95,6 @@ start() { config_load bluetooth config_foreach hcid_config hcid - config_foreach sdpd_config sdpd config_foreach rfcomm_config rfcomm config_foreach dund_config dund config_foreach pand_config pand @@ -114,6 +104,5 @@ stop() { killall dund killall pand /usr/bin/rfcomm release all - killall sdpd killall hcid } -- 2.30.2