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 6b6599da46ddda25d5f07e88e9227e52a0719f26..90ac6af379cc48c7f7ef471ef8d571e20515df1e 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -45,6 +45,11 @@ 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
@@ -131,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
@@ -148,6 +164,8 @@ case "$1" in
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
            do_modprobe sunrpc
+           do_modprobe nfs
+           do_modprobe nfsd
            if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]