releasing version 1:1.2.8-2

[nfs-utils.git] / debian / nfs-common.init

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index e5c2a0243b8d915f2e95a4e2ac2cec1c91fcf823..a0eab38795cef1a93796c11a4de89eff45027b1a 100644 (file)
--- 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
-           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