Author: glen Date: Sun Sep 11 19:35:33 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- unify
---- Files affected:
packages/bluez:
bluez.init (1.8 -> 1.9) , dund.init (1.2 -> 1.3) , pand.init (1.2 -> 1.3) ,
rfcomm.init (1.2 -> 1.3)
---- Diffs:
================================================================
Index: packages/bluez/bluez.init
diff -u packages/bluez/bluez.init:1.8 packages/bluez/bluez.init:1.9
--- packages/bluez/bluez.init:1.8 Fri Oct 29 01:58:50 2010
+++ packages/bluez/bluez.init Sun Sep 11 21:35:28 2011
@@ -16,35 +16,50 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/bluetooth ]; then
- if [ -x /sbin/udevadm ]; then
- msg_starting "Bluetooth devices"
- daemon /sbin/udevadm trigger
--subsystem-match=bluetooth --action=add
- RETVAL=$?
- touch /var/lock/subsys/bluetooth
- fi
- else
+ if [ -f /var/lock/subsys/bluetooth ]; then
msg_already_running bluetooth
+ return
+ fi
+
+ if [ ! -x /sbin/udevadm ]; then
+ return
fi
+
+ msg_starting "Bluetooth devices"
+ daemon /sbin/udevadm trigger --subsystem-match=bluetooth --action=add
+ RETVAL=$?
+ touch /var/lock/subsys/bluetooth
}
stop() {
- if [ -f /var/lock/subsys/bluetooth ]; then
- # nothing needed to stop it
- rm -f /var/lock/subsys/bluetooth
- else
+ if [ ! -f /var/lock/subsys/bluetooth ]; then
msg_not_running bluetooth
+ return
fi
+
+ # nothing needed to stop it
+ rm -f /var/lock/subsys/bluetooth
}
condrestart() {
- if [ -f /var/lock/subsys/bluetooth ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/bluetooth ]; then
msg_not_running bluetooth
RETVAL=$1
+ return
+ fi
+
+ stop
+ start
+}
+
+status() {
+ if [ ! -f /var/lock/subsys/bluetooth ]; then
+ msg_not_running bluetooth
+ RETVAL=3
+ return $RETVAL
fi
+
+ nls "bluetooth is running"
}
RETVAL=0
@@ -64,13 +79,8 @@
condrestart 0
;;
status)
- if [ -f /var/lock/subsys/bluetooth ]; then
- nls "bluetooth is running"
- exit 0
- else
- msg_not_running bluetooth
- exit 3
- fi
+ status
+ RETVAL=$?
;;
*)
msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
================================================================
Index: packages/bluez/dund.init
diff -u packages/bluez/dund.init:1.2 packages/bluez/dund.init:1.3
--- packages/bluez/dund.init:1.2 Fri Oct 29 01:58:50 2010
+++ packages/bluez/dund.init Sun Sep 11 21:35:28 2011
@@ -18,34 +18,47 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/dund ]; then
- msg_starting dund
- daemon /usr/bin/dund ${DUND_OPTIONS}
- RETVAL=$?
- touch /var/lock/subsys/dund
- else
+ if [ -f /var/lock/subsys/dund ]; then
msg_already_running dund
+ return
fi
+
+ msg_starting dund
+ daemon /usr/bin/dund ${DUND_OPTIONS}
+ RETVAL=$?
+ touch /var/lock/subsys/dund
}
stop() {
- if [ -f /var/lock/subsys/dund ]; then
- msg_stopping dund
- killproc /usr/bin/dund
- rm -f /var/lock/subsys/dund
- else
+ if [ ! -f /var/lock/subsys/dund ]; then
msg_not_running dund
+ return
fi
+
+ msg_stopping dund
+ killproc /usr/bin/dund
+ rm -f /var/lock/subsys/dund
}
condrestart() {
- if [ -f /var/lock/subsys/dund ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/dund ]; then
msg_not_running dund
RETVAL=$1
+ return
+ fi
+
+ stop
+ start
+}
+
+status() {
+ if [ ! -f /var/lock/subsys/dund ]; then
+ msg_not_running dund
+ RETVAL=3
+ return $RETVAL
fi
+
+ nls "dund is running"
}
RETVAL=0
@@ -65,13 +78,8 @@
condrestart 0
;;
status)
- if [ -f /var/lock/subsys/dund ]; then
- nls "dund is running"
- exit 0
- else
- msg_not_running dund
- exit 3
- fi
+ status
+ RETVAL=$?
;;
*)
msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
================================================================
Index: packages/bluez/pand.init
diff -u packages/bluez/pand.init:1.2 packages/bluez/pand.init:1.3
--- packages/bluez/pand.init:1.2 Fri Oct 29 01:58:50 2010
+++ packages/bluez/pand.init Sun Sep 11 21:35:28 2011
@@ -20,34 +20,37 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/pand ]; then
- msg_starting pand
- daemon /usr/bin/pand ${PAND_OPTIONS}
- RETVAL=$?
- touch /var/lock/subsys/pand
- else
+ if [ -f /var/lock/subsys/pand ]; then
msg_already_running pand
+ return
fi
+
+ msg_starting pand
+ daemon /usr/bin/pand ${PAND_OPTIONS}
+ RETVAL=$?
+ touch /var/lock/subsys/pand
}
stop() {
- if [ -f /var/lock/subsys/pand ]; then
- msg_stopping pand
- killproc /usr/bin/pand
- rm -f /var/lock/subsys/pand
- else
+ if [ ! -f /var/lock/subsys/pand ]; then
msg_not_running pand
+ return
fi
+
+ msg_stopping pand
+ killproc /usr/bin/pand
+ rm -f /var/lock/subsys/pand
}
condrestart() {
- if [ -f /var/lock/subsys/pand ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/pand ]; then
msg_not_running pand
RETVAL=$1
+ return
fi
+
+ stop
+ start
}
RETVAL=0
================================================================
Index: packages/bluez/rfcomm.init
diff -u packages/bluez/rfcomm.init:1.2 packages/bluez/rfcomm.init:1.3
--- packages/bluez/rfcomm.init:1.2 Fri Oct 29 01:58:50 2010
+++ packages/bluez/rfcomm.init Sun Sep 11 21:35:28 2011
@@ -21,34 +21,47 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/rfcomm ]; then
- msg_starting rfcomm
- daemon /usr/bin/rfcomm -f /etc/bluetooth/rfcomm.conf bind all
- RETVAL=$?
- touch /var/lock/subsys/rfcomm
- else
+ if [ -f /var/lock/subsys/rfcomm ]; then
msg_already_running rfcomm
+ return
fi
+
+ msg_starting rfcomm
+ daemon /usr/bin/rfcomm -f /etc/bluetooth/rfcomm.conf bind all
+ RETVAL=$?
+ touch /var/lock/subsys/rfcomm
}
stop() {
- if [ -f /var/lock/subsys/rfcomm ]; then
- msg_stopping rfcomm
- daemon /usr/bin/rfcomm release all
- rm -f /var/lock/subsys/rfcomm
- else
+ if [ ! -f /var/lock/subsys/rfcomm ]; then
msg_not_running rfcomm
+ return
fi
+
+ msg_stopping rfcomm
+ daemon /usr/bin/rfcomm release all
+ rm -f /var/lock/subsys/rfcomm
}
condrestart() {
- if [ -f /var/lock/subsys/rfcomm ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/rfcomm ]; then
msg_not_running rfcomm
RETVAL=$1
+ return
+ fi
+
+ stop
+ start
+}
+
+status() {
+ if [ ! -f /var/lock/subsys/rfcomm ]; then
+ msg_not_running rfcomm
+ RETVAL=3
+ return
fi
+
+ nls "rfcomm is running"
}
RETVAL=0
@@ -68,13 +81,7 @@
condrestart 0
;;
status)
- if [ -f /var/lock/subsys/rfcomm ]; then
- nls "rfcomm is running"
- exit 0
- else
- msg_not_running rfcomm
- exit 3
- fi
+ status
;;
*)
msg_usage "$0
{start|stop|restart|try-restart|reload|force-reload|status}"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/bluez.init?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/dund.init?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/pand.init?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/rfcomm.init?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
