X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=a0eab38795cef1a93796c11a4de89eff45027b1a;hp=902741014447dc3db7b190c7eb7ffb43e42c6f4b;hb=a15ed5a2727eaa45b17876b1eea47f003da1c9ef;hpb=d6101fd242f57fe949c8cb69b586bf80cefed62e

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 9027410..a0eab38 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -17,7 +17,6 @@ DESC="NFS common utilities"
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
-PREFIX=
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
@@ -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
@@ -139,25 +138,27 @@ case "$1" in
 	    log_progress_msg "statd"
 	    
 	    # See if rpcbind is running
-	    /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
+	    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