From: Jacek Konieczny <jajcus@pld-linux.org>
Date: Wed, 28 May 2008 19:17:40 +0000 (+0000)
Subject: - sdpd binary is no more
X-Git-Tag: auto/th/bluez-utils-3_32-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fbluez-utils.git;a=commitdiff_plain;h=f80a251cb2fdac9ab9d1b9d05c3212b4cb3ca222

- sdpd binary is no more

Changed files:
    bluez-utils.init -> 1.15
---

diff --git a/bluez-utils.init b/bluez-utils.init
index e5e37b2..df2c62f 100644
--- a/bluez-utils.init
+++ b/bluez-utils.init
@@ -31,14 +31,13 @@ start() {
 		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 -f /etc/bluetooth/hcid.conf
-			RETVAL=$?
-		fi
-	
-		if is_yes "${SDPD_ENABLE}" && [ -x /usr/sbin/sdpd ]; then
-			msg_starting sdpd
-			daemon /usr/sbin/sdpd
+			daemon /usr/sbin/hcid $HCID_FLAGS
 			RETVAL=$?
 		fi
 		
@@ -99,11 +98,6 @@ stop() {
 			killproc /usr/bin/hidd
 		fi
 	
-		if is_yes "${SDPD_ENABLE}" && [ -x /usr/sbin/sdpd ]; then
-			msg_stopping sdpd
-			killproc /usr/sbin/sdpd
-		fi
-	
 		if is_yes "${HCID_ENABLE}" && [ -x /usr/sbin/hcid ]; then
 			msg_stopping hcid
 			killproc /usr/sbin/hcid