- BR: libnfsidmap >= 0.23 (required nfs4_owner interfaces)

[packages/nfs-utils.git] / rpcsvcgssd.init

diff --git a/rpcsvcgssd.init b/rpcsvcgssd.init
index fb79e4f2701aa06742d69dd58e0eb6082bce2ebf..cf5bc630e294a9f18e6674ff53a7a275a48e6f67 100644 (file)
--- a/rpcsvcgssd.init
+++ b/rpcsvcgssd.init
@@ -22,8 +22,8 @@ else
        exit 0
 fi
 
-if [ -x /sbin/pidof ] && [ "$1" != "stop" ]; then
-       [ -z "`/sbin/pidof portmap`" ] && nls "Error: portmap isn't running" && exit 0
+if [ "$1" != "stop" ]; then
+       check_portmapper || { nls "Error: portmap isn't running" && exit 0; }
 fi
 
 # Get service config
@@ -34,48 +34,56 @@ 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
+start() {
+       # Check if the service is already running?
+       if [ -f /var/lock/subsys/svcgssd ]; then
+               msg_already_running "RPC svcgssd"
+               return
+       fi
+
+       # We need /proc/fs/nfsd mounted before starting svcgssd
+       if ! grep -q nfsd /proc/mounts ; then
+               modprobe nfsd > /dev/null 2>&1
+               run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
+       fi
+       # Load rpcsec modules
+       for i in ${SECURE_NFS_MODS} ; do 
+               _modprobe single die $i
+       done
+       msg_starting "RPC svcgssd"
+       daemon /usr/sbin/rpc.svcgssd $RPCSVCGSSOPTIONS
+       RETVAL=$?
+       [ $RETVAL = 0 ] && touch /var/lock/subsys/svcgssd
+}
+
+stop() {
+       if [ ! -f /var/lock/subsys/svcgssd ]; then
+               msg_not_running "RPC svcgssd"
+               return
+       fi
+
+       msg_stopping "RPC svcgssd"
+       killproc rpc.svcgssd
+       rm -f /var/lock/subsys/svcgssd
+}
 
 # See how we were called.
+RETVAL=0
 case "$1" in
   start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/svcgssd ]; then
-               # We need /proc/fs/nfsd mounted before starting svcgssd
-               if ! grep -q nfsd /proc/mounts ; then
-                       modprobe -s nfsd > /dev/null 2>&1
-                       run_cmd "Mounting /proc/fs/nfsd filesystem" mount -t nfsd nfsd /proc/fs/nfsd
-               fi
-               # Load rpcsec modules
-               for i in ${SECURE_NFS_MODS} ; do 
-                       _modprobe single die $i
-               done
-               msg_starting "RPC svcgssd"
-               daemon rpc.svcgssd $RPCSVCGSSOPTIONS
-               RETVAL=$?
-               [ $RETVAL = 0 ] && touch /var/lock/subsys/svcgssd
-       else
-               msg_already_running "RPC svcgssd"
-       fi
+       start
        ;;
   stop)
-       if [ -f /var/lock/subsys/svcgssd ]; then
-               msg_stopping "RPC svcgssd"
-               killproc rpc.svcgssd
-               rm -f /var/lock/subsys/svcgssd
-       else
-               msg_not_running "RPC svcgssd"
-       fi
+       stop
+       ;;
+  restart|reload)
+       stop
+       start
        ;;
   status)
        status rpc.svcgssd
        RETVAL=$?
        ;;
-  restart|reload)
-       $0 stop
-       $0 start
-       RETVAL=$?
-       ;;
   *)
        msg_usage "$0 {start|stop|restart|status}"
        exit 1