- updated to rc-scripts 0.2.0

Changed files:
    nfs.init -> 1.10
    nfsfs.init -> 1.2
    nfslock.init -> 1.2
    rquotad.init -> 1.2

diff --git a/nfs.init b/nfs.init
index 2c14d26fd4a5506d21a4ee889381b4f7ea8c1516..56f0924de36408abf6dc339d0fb0360843aab9e2 100644 (file)
--- a/nfs.init
+++ b/nfs.init
@@ -19,8 +19,8 @@
 [ -f /etc/sysconfig/nfsd ] && . /etc/sysconfig/nfsd
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. Knfsd can't be run"
+if is_no "${NETWORKING}"; then
+       msg_Network_Down NFSD
        exit 1
 fi
 
@@ -38,16 +38,16 @@ case "$1" in
   start)
        # Start daemons.
        if [ "$NFSDTYPE" = "U" ] ; then
-               show "Starting NFS mountd"
+               msg_starting "NFS mountd"
                daemon rpc.mountd
-               show "Starting NFS daemon"
+               msg_starting "NFS daemon"
                daemon rpc.nfsd
        else
-               show "Starting NFS services"
+               msg_starting "NFS"
                daemon /usr/sbin/exportfs -r
-               show "Starting NFS mountd"
+               msg_starting "NFS mountd"
                daemon rpc.mountd $RPCMOUNTDOPTS
-               show "Starting NFS daemon"
+               msg_starting "NFS daemon"
                daemon rpc.nfsd $RPCNFSDCOUNT
        fi
        touch /var/lock/subsys/nfs
@@ -55,16 +55,16 @@ case "$1" in
   stop)
        # Stop daemons.
        if [ "$NFSDTYPE" = "U" ] ; then
-               show "Shutting down NFS mountd"
+               msg_stopping "NFS mountd"
                killproc rpc.mountd
-               show "Shutting down NFS daemon"
+               msg_stopping "NFS daemon"
                killproc rpc.nfsd
        else
-               show "Shutting down NFS mountd"
+               msg_stopping "NFS mountd"
                killproc rpc.mountd
-               show "Shutting down NFS daemon"
+               msg_stopping "NFS daemon"
                killproc nfsd -QUIT
-               show "Shutting down NFS services"
+               msg_stopping "NFS"
                daemon /usr/sbin/exportfs -au
        fi
        rm -f /var/lock/subsys/nfs
@@ -110,7 +110,7 @@ case "$1" in
        fi
        ;;
   *)
-       echo "Usage: nfs {start|stop|status|restart|reload|probe}"
+       msg_Usage "$0 {start|stop|status|restart|reload|probe}"
        exit 1
 esac
 

diff --git a/nfsfs.init b/nfsfs.init
index 4c04a11102256db8a5201602627ef0a10f8376df..d886119adceca8f069e2b12e9ea6ea91179c208c 100644 (file)
--- a/nfsfs.init
+++ b/nfsfs.init
@@ -23,9 +23,9 @@ fi
 . /etc/sysconfig/network
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. NFS lockd and statd can't be run"
-        exit 1
+if is_no "${NETWORKING}"; then
+       msg_Network_Down nfsfs
+       exit 1
 fi
 
 # See how we were called.
@@ -66,7 +66,7 @@ case "$1" in
        mount -a -t nfs
        ;;
   *)
-       echo "Usage: $0 {start|stop|restart|reload|status}"
+       msg_Usage "$0 {start|stop|restart|reload|status}"
        exit 1
 esac
 

diff --git a/nfslock.init b/nfslock.init
index ac846722b1a6c5e184197cf461c8de1e82a4033f..826a250c8f32a35a64e23720475ff2bfda3659e2 100644 (file)
--- a/nfslock.init
+++ b/nfslock.init
@@ -19,8 +19,8 @@
 [ -f /etc/sysconfig/nfslock ] && . /etc/sysconfig/nfslock
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. NFS lockd and statd can't be run"
+if is_no "${NETWORKING}"; then
+       msg_Network_Down "NFS lockd"
        exit 1
 fi
 
@@ -36,17 +36,17 @@ fi
 case "$1" in
   start)
        # Start daemons.
-       show "Starting NFS lockd"
+       msg_starting "NFS lockd"
        daemon rpc.lockd
-       show "Starting NFS statd"
+       msg_starting "NFS statd"
        daemon rpc.statd
        touch /var/lock/subsys/nfslock
        ;;
   stop)
        # Stop daemons.
-       show "Shutting down NFS lockd"
+       msg_stopping "NFS lockd"
        killproc lockd
-       show "Shutting down NFS statd"
+       msg_stopping "NFS statd"
        killproc rpc.statd
        rm -f /var/lock/subsys/nfslock
        ;;
@@ -69,7 +69,7 @@ case "$1" in
        fi
        ;;
   *)
-       echo "Usage: nfslock {start|stop|status|restart}"
+       msg_Usage "$0 {start|stop|status|restart}"
        exit 1
 esac
 

diff --git a/rquotad.init b/rquotad.init
index 63cb342f142974d8583377b444d2ee5daf908fe9..706cbece3ac3b895b7487a294e581fb2669d6576 100644 (file)
--- a/rquotad.init
+++ b/rquotad.init
@@ -19,8 +19,8 @@
 [ -f /etc/sysconfig/rquotad ] && . /etc/sysconfig/rquotad
 
 # Check that networking is up.
-if [ "${NETWORKING}" = "no" ]; then
-       echo "WARNING: Networking is down. NFS rquotad and statd can't be run"
+if is_no "${NETWORKING}"; then
+       msg_Network_Down "NFS rquotad"
        exit 1
 fi
 
@@ -35,13 +35,13 @@ fi
 case "$1" in
   start)
        # Start daemons.
-       show "Starting NFS quotas"
+       msg_starting "NFS quotas"
        daemon rpc.rquotad
        touch /var/lock/subsys/rquotad
        ;;
   stop)
        # Stop daemons.
-       show "Shutting down NFS quotas"
+       msg_stopping "NFS quotas"
        killproc rpc.rquotad
        rm -f /var/lock/subsys/rquotad
        ;;
@@ -62,7 +62,7 @@ case "$1" in
        fi
        ;;
   *)
-       echo "Usage: rquotad {start|stop|status|restart|probe}"
+       msg_Usage "$0 {start|stop|status|restart|probe}"
        exit 1
 esac