nfs-common.init: Ignore empty and commented-out fstab lines (Closes: #587329)

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 0a018ccafc329e82a506357c739c1199389395c4..9f5ebf5bbca87ae2e67cdd453b449e0aa9a771ce 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
@@ -147,8 +152,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 ]