rpms/bluez-utils/devel bluetooth.init, 1.4, 1.5 dund.init, 1.4, 1.5 hidd.init, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

Author: pjones

Update of /cvs/dist/rpms/bluez-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1193

Modified Files:
	bluetooth.init dund.init hidd.init 
Log Message:
- make "status" work right for all 3 init scripts
- don't check networking before starting hidd
- don't bail on files provided by the package not being there when we're
  testing for their contents later anyway



Index: bluetooth.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/bluetooth.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bluetooth.init	2 May 2005 16:57:01 -0000	1.4
+++ bluetooth.init	17 Apr 2006 17:59:40 -0000	1.5
@@ -11,7 +11,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-
 UART_CONF="/etc/bluetooth/uart"
 
 [ -e /etc/sysconfig/bluetooth ] && . /etc/sysconfig/bluetooth
@@ -32,8 +31,10 @@
 start()
 {
 	echo -n $"Starting Bluetooth services:"
-	daemon /usr/sbin/hcid
-	daemon sdpd
+	daemon --pidfile /var/run/hcid.pid /usr/sbin/hcid
+	touch /var/lock/subsys/hcid
+	daemon --pidfile /var/run/sdpd.pid sdpd
+	touch /var/lock/subsys/sdpd
 	[ "$HID2HCI_ENABLE" = "true" ] && hid2hci --tohci > /dev/null 2>&1 || :
 	start_uarts
 	rfcomm bind all
@@ -47,7 +48,9 @@
 	stop_uarts
 	rfcomm release all
 	[ "$HID2HCI_UNDO" = "true" ] && hid2hci --tohid > /dev/null 2>&1 || :
+	rm -f /var/lock/subsys/sdpd
 	killproc sdpd
+	rm -f /var/lock/subsys/hcid
 	killproc hcid
 	rm -f /var/lock/subsys/bluetooth
 	echo ""


Index: dund.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/dund.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dund.init	7 Mar 2006 16:14:55 -0000	1.4
+++ dund.init	17 Apr 2006 17:59:40 -0000	1.5
@@ -14,14 +14,12 @@
 
 [ "${NETWORKING}" = "yes" ] || exit 0
 
-[ -r /etc/sysconfig/dund ] || exit 0
-
-. /etc/sysconfig/dund
-
-[ -z "$DUNDARGS" ] && exit 0
+[ -r /etc/sysconfig/dund ] && . /etc/sysconfig/dund
 
 start() 
 {
+	[ -z "$DUNDARGS" ] && exit 0
+
         echo -n $"Starting dund: "
         daemon /usr/bin/dund $DUNDARGS
 
@@ -39,8 +37,6 @@
         echo
 }
 
-[ -f /usr/bin/dund ] || exit 0
-
 # See how we were called.
 case "$1" in
   start)
@@ -56,6 +52,9 @@
   condrestart)
 	[ -e /var/lock/subsys/dund ] && (stop; start)
 	;;
+  status)
+  	status dund
+	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
         exit 1


Index: hidd.init
===================================================================
RCS file: /cvs/dist/rpms/bluez-utils/devel/hidd.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- hidd.init	7 Mar 2006 16:14:55 -0000	1.5
+++ hidd.init	17 Apr 2006 17:59:40 -0000	1.6
@@ -10,18 +10,12 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
-
-[ "${NETWORKING}" = "yes" ] || exit 0
-
-[ -r /etc/sysconfig/hidd ] || exit 0
-
-. /etc/sysconfig/hidd
-
-[ -z "$HIDDARGS" ] && exit 0
+[ -r /etc/sysconfig/hidd ] && . /etc/sysconfig/hidd
 
 start() 
 {
+	[ -z "$HIDDARGS" ] && exit 0
+
         echo -n $"Starting hidd: "
         daemon /usr/bin/hidd $HIDDARGS
 
@@ -56,6 +50,9 @@
   condrestart)
 	[ -e /var/lock/subsys/hidd ] && (stop; start)
 	;;
+  status)
+  	status hidd
+	;;
   *)
         echo $"Usage: $0 {start|stop|restart|reload|condrestart}"
         exit 1