- use functions

Changed files:
    rpcgssd.init -> 1.7
    rpcsvcgssd.init -> 1.10

diff --git a/rpcgssd.init b/rpcgssd.init
index ee75e6b86cce677d00c903271ca0735ad7cba7c5..4d67756e22a0b61bd8a6e951d7422532663242e6 100644 (file)
--- a/rpcgssd.init
+++ b/rpcgssd.init
@@ -37,11 +37,7 @@ is_yes "${SECURE_NFS}" || exit 0
 # /usr may be on NFS, fail silently, nfsfs will start it
 [ -x /usr/sbin/rpc.gssd ] || exit 0
 
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/gssd ]; then
                if ! grep -q rpc_pipefs /proc/mounts ; then
@@ -60,8 +56,9 @@ case "$1" in
        else
                msg_already_running "RPC gssd"
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/gssd ]; then
                msg_stopping "RPC gssd"
                killproc rpc.gssd
@@ -69,15 +66,24 @@ case "$1" in
        else
                msg_not_running "RPC gssd"
        fi
+}
+
+# See how we were called.
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status rpc.gssd
        RETVAL=$?
        ;;
   restart|reload)
-       $0 stop
-       $0 start
-       RETVAL=$?
+       stop
+       start
        ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"

diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index fb79e4f2701aa06742d69dd58e0eb6082bce2ebf..2f63c9aec847b7bd04411d593fe779e839e9abed 100644 (file)
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -34,11 +34,7 @@ is_yes "${SECURE_NFS}" || exit 0
 # List of kernel modules to load
 [ -z "${SECURE_NFS_MODS}" ] && SECURE_NFS_MODS="des rpcsec_gss_krb5"
 
-RETVAL=0
-
-# See how we were called.
-case "$1" in
-  start)
+start() {
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/svcgssd ]; then
                # We need /proc/fs/nfsd mounted before starting svcgssd
@@ -57,8 +53,9 @@ case "$1" in
        else
                msg_already_running "RPC svcgssd"
        fi
-       ;;
-  stop)
+}
+
+stop() {
        if [ -f /var/lock/subsys/svcgssd ]; then
                msg_stopping "RPC svcgssd"
                killproc rpc.svcgssd
@@ -66,15 +63,24 @@ case "$1" in
        else
                msg_not_running "RPC svcgssd"
        fi
+}
+
+# See how we were called.
+RETVAL=0
+case "$1" in
+  start)
+       start
+       ;;
+  stop)
+       stop
        ;;
   status)
        status rpc.svcgssd
        RETVAL=$?
        ;;
   restart|reload)
-       $0 stop
-       $0 start
-       RETVAL=$?
+       stop
+       start
        ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"