Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f1dd4cce92761348f6203fb15e508b134ca89ecb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f1dd4cce92761348f6203fb15e508b134ca89ecb)
  • Date: Sat, 22 Mar 2008 07:48:31 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

utils/bluez-utils/BUILD | 3 +
utils/bluez-utils/CONFIGURE | 1
utils/bluez-utils/HISTORY | 5 ++
utils/bluez-utils/init.d/bluetooth | 66
++++++++++---------------------------
4 files changed, 28 insertions(+), 47 deletions(-)

New commits:
commit f1dd4cce92761348f6203fb15e508b134ca89ecb
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

bluez-utils: renewed the script, enabled SDP daemon selection

diff --git a/utils/bluez-utils/BUILD b/utils/bluez-utils/BUILD
new file mode 100755
index 0000000..dd93c74
--- /dev/null
+++ b/utils/bluez-utils/BUILD
@@ -0,0 +1,3 @@
+OPTS="$OPTS $SDPD" &&
+
+default_build
diff --git a/utils/bluez-utils/CONFIGURE b/utils/bluez-utils/CONFIGURE
new file mode 100755
index 0000000..1938a68
--- /dev/null
+++ b/utils/bluez-utils/CONFIGURE
@@ -0,0 +1 @@
+config_query_option SDPD "Enable SDP daemon?" y "--enable-sdpd" ""
diff --git a/utils/bluez-utils/HISTORY b/utils/bluez-utils/HISTORY
index d24adcd..ff72b79 100644
--- a/utils/bluez-utils/HISTORY
+++ b/utils/bluez-utils/HISTORY
@@ -1,3 +1,8 @@
+2008-03-22 Vlad Glagolev <stealth AT sourcemage.org>
+ * init.d/bluetooth: renewed the script (removed useless stuff, fixed
+ the bug about double-running of bluetooth service to remove a
warning)
+ * BUILD, CONFIGURE: enabled sdpd selection
+
2008-03-08 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 3.28

diff --git a/utils/bluez-utils/init.d/bluetooth
b/utils/bluez-utils/init.d/bluetooth
index 6d78490..4304ba2 100755
--- a/utils/bluez-utils/init.d/bluetooth
+++ b/utils/bluez-utils/init.d/bluetooth
@@ -1,57 +1,42 @@
#!/bin/sh
-#
-# bluetooth Bluetooth subsystem starting and stopping
-#
-# chkconfig: 345 25 90
-# description: Bluetooth subsystem
-# SMGL-script-version=20030714
-# SMGL-START:S:S25
-# SMGL-STOP:0 6:K90
-#
-# Source function library.
-#. /etc/init.d/functions
-. /etc/init.d/smgl_init
-
-# Source Bluetooth configuration.
-#. /etc/sysconfig/bluetooth

-prog="Bluetooth"
PROGRAM=/usr/sbin/hcid
RUNLEVEL=3
NEEDS="+local_fs"
-
UART_CONF="/etc/bluetooth/uart"

-start_uarts()
-{
+. /etc/init.d/smgl_init
+
+start_uarts() {
[ -f /sbin/hciattach -a -f $UART_CONF ] || return
grep -v '^#' $UART_CONF | while read i; do
/usr/sbin/hciattach $i
done
}

-stop_uarts()
-{
+stop_uarts() {
killproc hciattach > /dev/null 2>&1
}

-start()
-{
- echo $"Starting $prog: "
- loadproc $PROGRAM
+start() {
+ echo "Starting $NAME..."
+ $PROGRAM
+ evaluate_retval

if [ -x /usr/sbin/sdpd ]; then
- loadproc /usr/sbin/sdpd
+ echo "Running sdpd..."
+ /usr/sbin/sdpd
+ evaluate_retval
fi

start_uarts
+
[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys
touch /var/lock/subsys/bluetooth
}

-stop()
-{
- echo $"Shutting down $prog: "
+stop() {
+ echo "Shutting down $NAME..."
killproc hcid

if [ -x /usr/sbin/sdpd ]; then
@@ -62,23 +47,10 @@ stop()
rm -f /var/lock/subsys/bluetooth
}

-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart|reload)
- stop
- start
- ;;
- condrestart)
+condrestart() {
[ -e /var/lock/subsys/bluetooth ] && (stop; start)
- ;;
- *)
- echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
- exit 1
-esac
+}

-exit 0
+usage() {
+ echo "Usage $0 {start|stop|restart|condrestart}"
+}



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (f1dd4cce92761348f6203fb15e508b134ca89ecb), Vlad Glagolev, 03/22/2008

Archive powered by MHonArc 2.6.24.

Top of Page