Imported Debian patch 1.1.0-10

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c6b0a9a284ca79a4baf7011b14c4f68a6d15fa63..54701d7d931a2dcb4aa370a7b9823f92af280fb7 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -2,9 +2,9 @@
 
 ### BEGIN INIT INFO
 # Provides:          nfs-common
-# Required-Start:    $time
+# Required-Start:    $portmap $time
 # Required-Stop:     $time
-# Default-Start:     2 3 4 5
+# Default-Start:     2 3 4 5 S
 # Default-Stop:      0 1 6
 # Short-Description: NFS support files common to client and server
 # Description:       NFS is a popular protocol for file sharing across
@@ -36,21 +36,23 @@ fi
 AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
-exec 9<&0 </etc/fstab
+if [ -f /etc/fstab ]; then
+    exec 9<&0 </etc/fstab
 
-while read DEV MTPT FSTYPE OPTS REST
-do
-    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
-       ;;
-    esac
-done
-
-exec 0<&9 9<&-
+    while read DEV MTPT FSTYPE OPTS REST
+    do
+        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
+            ;;
+        esac
+    done
+
+    exec 0<&9 9<&-
+fi
 
 #
 # We also need idmapd if we run an NFSv4 server. It's fairly difficult