X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=a93097661f64d772b8b38052d1040cdd5d03a67f;hp=6de833621209841e766b00cce2caa29ac2978334;hb=11e2834381fa3eb7b6ef6420241532896f2900bf;hpb=ebf259dfcee762c98ac530d558ca9126c983b1a5

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 6de8336..a930976 100644
--- 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"
@@ -19,15 +19,15 @@ 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
 
+. /lib/lsb/init-functions
+
 # Determine whether lockd daemon is required.
 case "$NEED_LOCKD" in
 yes|no)	;;
@@ -74,6 +74,20 @@ done
 
 exec 0<&9 9<&-
 
+#
+# 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
+
+
 case "$NEED_IDMAPD" in
     yes|no)	
         ;;
@@ -124,16 +138,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"
+	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"
+	    log_progress_msg "lockd"
 	    start-stop-daemon --start --oknodo --quiet \
-		--exec $PREFIX/sbin/rpc.lockd  || true
+		--exec $PREFIX/sbin/rpc.lockd
+	    if [ $? != 0 ]; then
+	        log_end_msg $?
+	        exit $?
+            fi
 	fi
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
@@ -143,53 +166,74 @@ case "$1" in
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
 		then
-		    printf " idmapd"
+	            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"
+	            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
-	    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
+	    if [ $? != 0 ]; then
+                log_end_msg $?
+                exit $?
+            fi
 	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)
@@ -201,7 +245,7 @@ case "$1" in
 
 	if [ "$NEED_GSSD" = yes ]
 	then
-            if [ ! -f "$GSSD_PIDFILE" ] || [ "$( pidof rpc.gssd )" != "$( cat $GSSD_PIDFILE )"]
+            if ! pidof rpc.gssd >/dev/null
 	    then
 		echo "rpc.statd running, but rpc.gssd halted"
 		exit 3
@@ -219,7 +263,7 @@ case "$1" in
 	    
 	if [ "$NEED_IDMAPD" = yes ]
 	then
-            if [ ! -f "$IDMAPD_PIDFILE" ] || [ "$( pidof rpc.idmapd )" != "$( cat $IDMAPD_PIDFILE )"]
+            if ! pidof rpc.idmapd >/dev/null
 	    then
 		echo "rpc.statd running, but rpc.idmapd halted"
 		exit 3
@@ -237,7 +281,7 @@ case "$1" in
 	;;
 
   *)
-	echo "Usage: nfs-common {start|stop|restart}"
+	log_success_msg "Usage: nfs-common {start|stop|status|restart}"
 	exit 1
 	;;
 esac