nfs-common.init: Add --pidfile for statd (Closes: #521084)

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c81edfb552b1b23aa88bb443b1dc60e21db62f41..90ac6af379cc48c7f7ef471ef8d571e20515df1e 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,7 +18,7 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
-NEED_STATD=yes
+NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
@@ -45,10 +45,16 @@ if [ -f /etc/fstab ]; then
 
     while read DEV MTPT FSTYPE OPTS REST
     do
+       case $DEV in
+           ''|\#*)
+               continue
+               ;;
+       esac
         if [ "$FSTYPE" = "nfs4" ]; then
             AUTO_NEED_IDMAPD=yes
         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,*)
            AUTO_NEED_GSSD=yes
             ;;
@@ -71,6 +77,14 @@ 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)    
         ;;
@@ -122,7 +136,18 @@ case "$1" in
 
        if [ "$NEED_STATD" = yes ]; then
            log_progress_msg "statd"
+           
+           # See if portmap or rpcbind are running
+           lsof -i :111 >/dev/null
+           RET=$?
+           if [ $RET != 0 ]; then
+               echo
+               log_warning_msg "Not starting: portmap daemon is not running"
+               exit 0
+           fi
+
            start-stop-daemon --start --oknodo --quiet \
+               --pidfile /var/run/rpc.statd.pid \
                --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
            RET=$?
            if [ $RET != 0 ]; then
@@ -138,8 +163,9 @@ case "$1" in
 
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
+           do_modprobe sunrpc
            do_modprobe nfs
-           do_modprobe nfs4
+           do_modprobe nfsd
            if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]