Imported Debian patch 1.0.9-4

[nfs-utils.git] / debian / nfs-common.init

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
old mode 100755 (executable)
new mode 100644 (file)
index df5fca2..5c34c9e
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,15 +1,15 @@
 #!/bin/sh
-#
-# nfs-common    This shell script takes care of starting and stopping
-#               common daemons required for NFS clients and servers.
-#
-# chkconfig: 345 20 80
-# description: NFS is a popular protocol for file sharing across \
-#             TCP/IP networks. This service provides NFS file \
-#             locking functionality.
-#
 
-set -e
+### BEGIN INIT INFO
+# Provides:          nfs-common
+# Required-Start:    $time
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: NFS support files common to client and server
+# Description:       NFS is a popular protocol for file sharing across
+#                   TCP/IP networks. This service provides various
+#                    support functions for NFS mounts.
+### END INIT INFO
 
 # What is this?
 DESC="NFS common utilities"
@@ -28,6 +28,8 @@ if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+. /lib/lsb/init-functions
+
 # Determine whether lockd daemon is required.
 case "$NEED_LOCKD" in
 yes|no)        ;;
@@ -124,16 +126,25 @@ do_umount() {
 # See how we were called.
 case "$1" in
   start)
-       cd /    # daemons should have root dir as cwd
-       printf "Starting $DESC:"
-       printf " statd"
-       start-stop-daemon --start --quiet \
+       log_daemon_msg "Starting $DESC"
+
+       log_progress_msg "statd"
+       start-stop-daemon --start --oknodo --quiet \
            --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+       if [ $? != 0 ]; then
+           log_end_msg $?
+           exit $?
+       fi
+
        if [ "$NEED_LOCKD" = yes ]
        then
-           printf " lockd"
-           start-stop-daemon --start --quiet \
-               --exec $PREFIX/sbin/rpc.lockd  || true
+           log_progress_msg "lockd"
+           start-stop-daemon --start --oknodo --quiet \
+               --exec $PREFIX/sbin/rpc.lockd
+           if [ $? != 0 ]; then
+               log_end_msg $?
+               exit $?
+            fi
        fi
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
@@ -143,53 +154,116 @@ case "$1" in
            then
                if [ "$NEED_IDMAPD" = yes ]
                then
-                   printf " idmapd"
-                   start-stop-daemon --start --quiet \
+                   log_progress_msg "idmapd"
+                   start-stop-daemon --start --oknodo --quiet \
                            --make-pidfile --pidfile $IDMAPD_PIDFILE \
                            --exec /usr/sbin/rpc.idmapd
+                   if [ $? != 0 ]; then
+                       log_end_msg $?
+                       exit $?
+                    fi
                fi
                if [ "$NEED_GSSD" = yes ]
                then
                    do_modprobe rpcsec_gss_krb5
-                   printf " gssd"
-                   start-stop-daemon --start --quiet \
+                   log_progress_msg "gssd"
+                   start-stop-daemon --start --oknodo --quiet \
                            --make-pidfile --pidfile $GSSD_PIDFILE \
                            --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
+                   if [ $? != 0 ]; then
+                       log_end_msg $?
+                       exit $?
+                    fi
                fi
            fi
        fi
-       echo "."
+       log_end_msg 0
        ;;
 
   stop)
-       printf "Stopping $DESC:"
+       log_daemon_msg "Stopping $DESC"
+
        if [ "$NEED_GSSD" = yes ]
        then
-           printf " gssd"
+           log_progress_msg "gssd"
            start-stop-daemon --stop --oknodo --quiet \
                    --name rpc.gssd
+           if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
            rm -f $GSSD_PIDFILE
        fi
        if [ "$NEED_IDMAPD" = yes ]
        then
-           printf " idmapd"
+           log_progress_msg "idmapd"
            start-stop-daemon --stop --oknodo --quiet \
                --name rpc.idmapd
+           if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
            rm -f $IDMAPD_PIDFILE
        fi
        if [ "$NEED_LOCKD" = yes ]
        then
-           printf " lockd"
+           log_progress_msg "lockd"
            start-stop-daemon --stop --oknodo --quiet \
-               --name rpc.lockd || true
+               --name rpc.lockd
+           if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
        else
            pkill -KILL -u root -x lockd || true
        fi
-       printf " statd"
+       log_progress_msg "statd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.statd
+       if [ $? != 0 ]; then
+            log_end_msg $?
+            exit $?
+        fi
        do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true
-       echo "."
+       log_end_msg 0
+       ;;
+
+  status)
+       if ! pidof rpc.statd >/dev/null
+       then
+           echo "rpc.statd not running"
+           exit 3
+       fi
+
+       if [ "$NEED_GSSD" = yes ]
+       then
+            if [ ! -f "$GSSD_PIDFILE" ] || ! pidof rpc.gssd >/dev/null
+           then
+               echo "rpc.statd running, but rpc.gssd halted"
+               exit 3
+           fi
+       fi
+
+       if [ "$NEED_LOCKD" = yes ]
+       then
+           if ! pidof rpc.lockd >/dev/null
+           then
+               echo "rpc.statd running, but rpc.lockd halted"
+               exit 3
+           fi
+       fi
+           
+       if [ "$NEED_IDMAPD" = yes ]
+       then
+            if [ ! -f "$IDMAPD_PIDFILE" ] || ! pidof rpc.idmapd >/dev/null
+           then
+               echo "rpc.statd running, but rpc.idmapd halted"
+               exit 3
+           fi
+       fi
+
+       echo "rpc.statd running"
+       exit 0
        ;;
 
   restart | force-reload)
@@ -199,7 +273,7 @@ case "$1" in
        ;;
 
   *)
-       echo "Usage: nfs-common {start|stop|restart}"
+       log_success_msg "Usage: nfs-common {start|stop|status|restart}"
        exit 1
        ;;
 esac