Author: gotar                        Date: Thu Oct 28 23:58:55 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- verbose status messages, return code 3 if not running, minor fixes

---- Files affected:
packages/bluez:
   bluez.init (1.7 -> 1.8) , dund.init (1.1 -> 1.2) , pand.init (1.1 -> 1.2) , 
rfcomm.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/bluez/bluez.init
diff -u packages/bluez/bluez.init:1.7 packages/bluez/bluez.init:1.8
--- packages/bluez/bluez.init:1.7       Sun Apr 25 20:07:44 2010
+++ packages/bluez/bluez.init   Fri Oct 29 01:58:50 2010
@@ -65,9 +65,11 @@
        ;;
   status)
        if [ -f /var/lock/subsys/bluetooth ]; then
+               nls "bluetooth is running"
                exit 0
        else
-               exit 1
+               msg_not_running bluetooth
+               exit 3
        fi
        ;;
   *)

================================================================
Index: packages/bluez/dund.init
diff -u packages/bluez/dund.init:1.1 packages/bluez/dund.init:1.2
--- packages/bluez/dund.init:1.1        Tue Aug  4 21:13:20 2009
+++ packages/bluez/dund.init    Fri Oct 29 01:58:50 2010
@@ -66,9 +66,11 @@
        ;;
   status)
        if [ -f /var/lock/subsys/dund ]; then
+               nls "dund is running"
                exit 0
        else
-               exit 1
+               msg_not_running dund
+               exit 3
        fi
        ;;
   *)

================================================================
Index: packages/bluez/pand.init
diff -u packages/bluez/pand.init:1.1 packages/bluez/pand.init:1.2
--- packages/bluez/pand.init:1.1        Tue Aug  4 21:13:20 2009
+++ packages/bluez/pand.init    Fri Oct 29 01:58:50 2010
@@ -21,9 +21,9 @@
 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=$?
+               msg_starting pand
+               daemon /usr/bin/pand ${PAND_OPTIONS}
+               RETVAL=$?
                touch /var/lock/subsys/pand
        else
                msg_already_running pand
@@ -32,8 +32,8 @@
 
 stop() {
        if [ -f /var/lock/subsys/pand ]; then
-                       msg_stopping pand
-                       killproc /usr/bin/pand
+               msg_stopping pand
+               killproc /usr/bin/pand
                rm -f /var/lock/subsys/pand
        else
                msg_not_running pand
@@ -69,9 +69,11 @@
   status)
        status pand
        if [ -f /var/lock/subsys/pand ]; then
+               nls "pand is running"
                exit 0
        else
-               exit 1
+               msg_not_running pand
+               exit 3
        fi
        ;;
   *)

================================================================
Index: packages/bluez/rfcomm.init
diff -u packages/bluez/rfcomm.init:1.1 packages/bluez/rfcomm.init:1.2
--- packages/bluez/rfcomm.init:1.1      Tue Aug  4 21:13:20 2009
+++ packages/bluez/rfcomm.init  Fri Oct 29 01:58:50 2010
@@ -37,7 +37,7 @@
                daemon /usr/bin/rfcomm release all
                rm -f /var/lock/subsys/rfcomm
        else
-               msg_not_running bluetooth
+               msg_not_running rfcomm
        fi
 }
 
@@ -69,9 +69,11 @@
        ;;
   status)
        if [ -f /var/lock/subsys/rfcomm ]; then
+               nls "rfcomm is running"
                exit 0
        else
-               exit 1
+               msg_not_running rfcomm
+               exit 3
        fi
        ;;
   *)
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/bluez.init?r1=1.7&r2=1.8&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/dund.init?r1=1.1&r2=1.2&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/pand.init?r1=1.1&r2=1.2&f=u
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bluez/rfcomm.init?r1=1.1&r2=1.2&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to