X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=54701d7d931a2dcb4aa370a7b9823f92af280fb7;hp=df5fca289018993800860d35a89e9a8c446dfcae;hb=59840096395f070e67af445e509037ef565520d0;hpb=a844d5c56ef076c8961e7396b601e9a2bdeb546f

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
old mode 100755
new mode 100644
index df5fca2..54701d7
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,15 +1,16 @@
 #!/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:    $portmap $time
+# Required-Stop:     $time
+# Default-Start:     2 3 4 5 S
+# 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"
@@ -17,38 +18,15 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_LOCKD=
 NEED_IDMAPD=
-IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
 NEED_GSSD=
-GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
-# Determine whether lockd daemon is required.
-case "$NEED_LOCKD" in
-yes|no)	;;
-*)  case `uname -r` in
-    '' | [01].* | 2.[0123].* )
-	# Older kernels may or may not need a lockd daemon.
-	# We must assume they do, unless we can prove otherwise.
-	# (A false positive here results only in a harmless message.)
-	NEED_LOCKD=yes
-	if test -f /proc/ksyms
-	then
-	    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
-	fi
-	;;
-
-    *)  # Modern kernels (>= 2.4) start a lockd thread automatically.
-	NEED_LOCKD=no
-	;;
-    esac
-    ;;
-esac
+. /lib/lsb/init-functions
 
 #
 # Parse the fstab file, and determine whether we need idmapd and gssd. (The
@@ -58,21 +36,37 @@ esac
 AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
-exec 9<&0 </etc/fstab
+if [ -f /etc/fstab ]; then
+    exec 9<&0 </etc/fstab
+
+    while read DEV MTPT FSTYPE OPTS REST
+    do
+        if [ "$FSTYPE" = "nfs4" ]; then
+            AUTO_NEED_IDMAPD=yes
+        fi
+        case "$OPTS" in
+            sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+    	    AUTO_NEED_GSSD=yes
+            ;;
+        esac
+    done
+
+    exec 0<&9 9<&-
+fi
 
-while read DEV MTPT FSTYPE OPTS REST
-do
-    if [ "$FSTYPE" = "nfs4" ]; then
-        AUTO_NEED_IDMAPD=yes
-    fi
-    case "$OPTS" in
-        sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-	    AUTO_NEED_GSSD=yes
-	;;
-    esac
-done
+#
+# We also need idmapd if we run an NFSv4 server. It's fairly difficult
+# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
+# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
+# file. This does not mean that there are NFSv4 or other mounts active (or
+# even that nfs-kernel-server is installed), but it matches what the "start"
+# condition in nfs-kernel-server's init script does, which has a value in
+# itself.
+#
+if [ -f /etc/exports ]; then
+    AUTO_NEED_IDMAPD=yes
+fi
 
-exec 0<&9 9<&-
 
 case "$NEED_IDMAPD" in
     yes|no)	
@@ -92,12 +86,14 @@ esac
 
 # Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.statd ] || exit 0
-[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD"  = no ] || exit 0
 [ -x /usr/sbin/rpc.idmapd   ] || [ "$NEED_IDMAPD" = no ] || exit 0
 [ -x /usr/sbin/rpc.gssd     ] || [ "$NEED_GSSD"   = no ] || exit 0
 
 do_modprobe() {
-    modprobe -q "$1" || true
+    if [ -x /sbin/modprobe -a -f /proc/modules ]
+    then
+        modprobe -q "$1" || true
+    fi
 }
 
 do_mount() {
@@ -124,17 +120,16 @@ 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 [ "$NEED_LOCKD" = yes ]
-	then
-	    printf " lockd"
-	    start-stop-daemon --start --quiet \
-		--exec $PREFIX/sbin/rpc.lockd  || true
+	if [ $? != 0 ]; then
+	    log_end_msg $?
+	    exit $?
 	fi
+
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
 	    do_modprobe nfs
@@ -143,53 +138,99 @@ case "$1" in
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
 		then
-		    printf " idmapd"
-		    start-stop-daemon --start --quiet \
-			    --make-pidfile --pidfile $IDMAPD_PIDFILE \
+	            log_progress_msg "idmapd"
+		    start-stop-daemon --start --oknodo --quiet \
 			    --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 \
-			    --make-pidfile --pidfile $GSSD_PIDFILE \
+	            log_progress_msg "gssd"
+
+	            # we need this available; better to fail now than
+		    # mysteriously on the first mount
+		    if ! grep -q -E '^nfs[	 ]' /etc/services; then
+		    	log_action_end_msg 1 "broken /etc/services, please see /usr/share/doc/nfs-common/README.Debian.nfsv4"
+			exit 1
+		    fi
+
+		    start-stop-daemon --start --oknodo --quiet \
 			    --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
-	    rm -f $GSSD_PIDFILE
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
 	fi
 	if [ "$NEED_IDMAPD" = yes ]
 	then
-	    printf " idmapd"
+	    log_progress_msg "idmapd"
 	    start-stop-daemon --stop --oknodo --quiet \
 		--name rpc.idmapd
-	    rm -f $IDMAPD_PIDFILE
-	fi
-	if [ "$NEED_LOCKD" = yes ]
-	then
-	    printf " lockd"
-	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd || true
-	else
-	    pkill -KILL -u root -x lockd || true
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
 	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 ! pidof rpc.gssd >/dev/null
+	    then
+		echo "rpc.statd running, but rpc.gssd halted"
+		exit 3
+	    fi
+	fi
+
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+            if ! 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 +240,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-common {start|stop|restart}"
+	log_success_msg "Usage: nfs-common {start|stop|status|restart}"
 	exit 1
 	;;
 esac