X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=92691f9ae51ee325d6a63f8d37336c80a13f207d;hp=18a4fddb4684b2c4e0d8947fe494a728a156957d;hb=6352825b8c7596ff09a3f84cff231999aca23ba6;hpb=da2897639a8b455d58977d37b16458faeffae5f8

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 18a4fdd..92691f9 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -17,11 +17,10 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
-PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -30,7 +29,7 @@ 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
@@ -50,9 +49,10 @@ if [ -f /etc/fstab ]; then
 		continue
 		;;
 	esac
-        if [ "$FSTYPE" = "nfs4" ]; then
+	# FSTYPE "nfs" can be NFSv4 now
+        #if [ "$FSTYPE" = "nfs4" ]; then
             AUTO_NEED_IDMAPD=yes
-        fi
+        #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,*)
@@ -137,26 +137,28 @@ case "$1" in
 	if [ "$NEED_STATD" = yes ]; then
 	    log_progress_msg "statd"
 	    
-	    # See if portmap or rpcbind are running
-	    cat </dev/null >/dev/tcp/localhost/111
-	    RET=$?
-	    if [ $RET != 0 ]; then
-		echo
-		log_warning_msg "Not starting: portmap daemon is not running"
-		exit 0
+	    # 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 \
 		--pidfile /var/run/rpc.statd.pid \
-	        --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
+	        --exec /sbin/rpc.statd -- $STATDOPTS
 	    RET=$?
 	    if [ $RET != 0 ]; then
 	        log_end_msg $RET
 	        exit $RET
 	    else
-		mkdir -p /lib/init/rw/sendsigs.omit.d
-		rm -f /lib/init/rw/sendsigs.omit.d/statd
-		ln -s /var/run/rpc.statd.pid /lib/init/rw/sendsigs.omit.d/statd
+		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
 
@@ -170,6 +172,7 @@ case "$1" in
 	    do_modprobe sunrpc
 	    do_modprobe nfs
 	    do_modprobe nfsd
+	    mkdir -p "$PIPEFS_MOUNTPOINT"
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]