nfs-common.init: Enable idmapd by default (Closes: #610363)

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 32e89c8373e783cfdcd6b55f3108658ad7b53c85..f1fadeb522fb50449acac0d9183dd5b4ad401c6f 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
@@ -50,9 +50,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,*)
@@ -138,7 +139,7 @@ case "$1" in
            log_progress_msg "statd"
            
            # See if portmap or rpcbind are running
-           lsof -i :111 >/dev/null
+           (cat </dev/null >/dev/tcp/localhost/111) 2>/dev/null
            RET=$?
            if [ $RET != 0 ]; then
                echo
@@ -147,11 +148,16 @@ case "$1" in
            fi
 
            start-stop-daemon --start --oknodo --quiet \
+               --pidfile /var/run/rpc.statd.pid \
                --exec $PREFIX/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
            fi
        fi