X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=25ff4f757c7314544a122eb1c0e06638dc19f863;hp=3cbb3229a54a9938e941d377b86b76c1bf676a72;hb=97820a9040bdfe3bccdbfc58b1df88883bba0abe;hpb=636f3185bd6b6bd214d64a8fd196f909268e2719

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 3cbb322..25ff4f7 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
@@ -17,11 +17,9 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
-NEED_STATD=yes
-NEED_IDMAPD=
+NEED_STATD=
 NEED_GSSD=
-PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -30,14 +28,13 @@ fi
 . /lib/lsb/init-functions
 
 # Exit if required binaries are missing.
-[ -x $PREFIX/sbin/rpc.statd ] || exit 0
+[ -x /sbin/rpc.statd ] || exit 0
 
 #
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# Parse the fstab file, and determine whether we need gssd. (The
 # /etc/defaults settings, if any, will override our autodetection.) This code
 # is partially adapted from the mountnfs.sh script in the sysvinit package.
 #
-AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
 if [ -f /etc/fstab ]; then
@@ -45,10 +42,13 @@ if [ -f /etc/fstab ]; then
 
     while read DEV MTPT FSTYPE OPTS REST
     do
-        if [ "$FSTYPE" = "nfs4" ]; then
-            AUTO_NEED_IDMAPD=yes
-        fi
+	case $DEV in
+	    ''|\#*)
+		continue
+		;;
+	esac
         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
             ;;
@@ -58,24 +58,19 @@ if [ -f /etc/fstab ]; then
     exec 0<&9 9<&-
 fi
 
-#
-# 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 ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
-    AUTO_NEED_IDMAPD=yes
-fi
+case "$NEED_STATD" in
+    yes|no)
+        ;;
+    *)
+        NEED_STATD=yes
+        ;;
+esac
 
 case "$NEED_IDMAPD" in
     yes|no)	
         ;;
     *)
-        NEED_IDMAPD=$AUTO_NEED_IDMAPD
+        NEED_IDMAPD=yes
 	;;
 esac
 
@@ -122,11 +117,29 @@ case "$1" in
 
 	if [ "$NEED_STATD" = yes ]; then
 	    log_progress_msg "statd"
+	    
+	    # See if rpcbind is running
+	    if [ -x /usr/sbin/rpcinfo ]; then
+		/usr/sbin/rpcinfo -p >/dev/null 2>&1
+		RET=$?
+		if [ $RET != 0 ]; then
+		   echo
+		   log_warning_msg "Not starting: portmapper is not running"
+		   exit 0
+		fi
+	    fi
 	    start-stop-daemon --start --oknodo --quiet \
-	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
-	    if [ $? != 0 ]; then
-	        log_end_msg $?
-	        exit $?
+		--pidfile /var/run/rpc.statd.pid \
+	        --exec /sbin/rpc.statd -- $STATDOPTS
+	    RET=$?
+	    if [ $RET != 0 ]; then
+	        log_end_msg $RET
+	        exit $RET
+	    else
+		if [ -d /run/sendsigs.omit.d ]; then
+		    rm -f /run/sendsigs.omit.d/statd
+		    ln -s /var/run/rpc.statd.pid /run/sendsigs.omit.d/statd
+		fi
 	    fi
 	fi
 
@@ -137,8 +150,10 @@ case "$1" in
 
 	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
 	then
+	    do_modprobe sunrpc
 	    do_modprobe nfs
-	    do_modprobe nfs4
+	    do_modprobe nfsd
+	    mkdir -p "$PIPEFS_MOUNTPOINT"
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
@@ -146,9 +161,10 @@ case "$1" in
 	            log_progress_msg "idmapd"
 		    start-stop-daemon --start --oknodo --quiet \
 			    --exec /usr/sbin/rpc.idmapd
-	            if [ $? != 0 ]; then
-        	        log_end_msg $?
-        	        exit $?
+		    RET=$?
+	            if [ $RET != 0 ]; then
+        	        log_end_msg $RET
+        	        exit $RET
                     fi
 		fi
 		if [ "$NEED_GSSD" = yes ]
@@ -165,9 +181,10 @@ case "$1" in
 
 		    start-stop-daemon --start --oknodo --quiet \
 			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
-	            if [ $? != 0 ]; then
-        	        log_end_msg $?
-        	        exit $?
+		    RET=$?
+	            if [ $RET != 0 ]; then
+        	        log_end_msg $RET
+        	        exit $RET
                     fi
 		fi
 	    fi
@@ -183,9 +200,10 @@ case "$1" in
 	    log_progress_msg "gssd"
 	    start-stop-daemon --stop --oknodo --quiet \
 		    --name rpc.gssd
-	    if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+	    RET=$?
+	    if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
 	fi
 	if [ "$NEED_IDMAPD" = yes ]
@@ -193,19 +211,21 @@ case "$1" in
 	    log_progress_msg "idmapd"
 	    start-stop-daemon --stop --oknodo --quiet \
 		--name rpc.idmapd
-	    if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+            RET=$?
+	    if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
 	fi
-	if ["$NEED_STATD" = yes ]
+	if [ "$NEED_STATD" = yes ]
 	then
 	    log_progress_msg "statd"
 	    start-stop-daemon --stop --oknodo --quiet \
 	        --name rpc.statd
-	    if [ $? != 0 ]; then
-                log_end_msg $?
-                exit $?
+	    RET=$?
+	    if [ $RET != 0 ]; then
+                log_end_msg $RET
+                exit $RET
             fi
 	fi
 	do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true