mounts.nfs: v2 and v3 background mounts should retry when server is down.

[nfs-utils.git] / utils / mount / nfs.man

diff --git a/utils/mount/nfs.man b/utils/mount/nfs.man
index dfb0bc956de66af5219ea378251e3419cf29eb72..0d20cf0d190665178c28b9efa45f22680397f73b 100644 (file)
--- a/utils/mount/nfs.man
+++ b/utils/mount/nfs.man
@@ -112,12 +112,16 @@ option may mitigate some of the risks of using the
 option.
 .TP 1.5i
 .BI timeo= n
 option.
 .TP 1.5i
 .BI timeo= n

-The time (in tenths of a second) the NFS client waits for a
-response before it retries an NFS request. If this
-option is not specified, requests are retried every
-60 seconds for NFS over TCP.
-The NFS client does not perform any kind of timeout backoff
-for NFS over TCP.
+The time in deciseconds (tenths of a second) the NFS client waits for a
+response before it retries an NFS request.
+.IP
+For NFS over TCP the default
+.B timeo
+value is 600 (60 seconds).
+The NFS client performs linear backoff: After each retransmission the 
+timeout is increased by
+.BR timeo 
+up to the maximum of 600 seconds.

 .IP
 However, for NFS over UDP, the client uses an adaptive
 algorithm to estimate an appropriate timeout value for frequently used
 .IP
 However, for NFS over UDP, the client uses an adaptive
 algorithm to estimate an appropriate timeout value for frequently used


@@ -368,14 +372,8 @@ Valid security flavors are
 .BR sys ,
 .BR krb5 ,
 .BR krb5i ,
 .BR sys ,
 .BR krb5 ,
 .BR krb5i ,

-.BR krb5p ,
-.BR lkey ,
-.BR lkeyi ,
-.BR lkeyp ,
-.BR spkm ,
-.BR spkmi ,

 and
 and

-.BR spkmp .
+.BR krb5p ,

 Refer to the SECURITY CONSIDERATIONS section for details.
 .TP 1.5i
 .BR sharecache " / " nosharecache
 Refer to the SECURITY CONSIDERATIONS section for details.
 .TP 1.5i
 .BR sharecache " / " nosharecache


@@ -1412,7 +1410,7 @@ security flavor encrypts every RPC request
 to prevent data exposure during network transit; however,
 expect some performance impact
 when using integrity checking or encryption.
 to prevent data exposure during network transit; however,
 expect some performance impact
 when using integrity checking or encryption.

-Similar support for other forms of cryptographic security (such as lipkey and SPKM3)
+Similar support for other forms of cryptographic security

 is also available.
 .P
 The NFS version 4 protocol allows
 is also available.
 .P
 The NFS version 4 protocol allows


@@ -1557,10 +1555,10 @@ To ensure that the saved mount options are not erased during a remount,
 specify either the local mount directory, or the server hostname and
 export pathname, but not both, during a remount.  For example,
 .P
 specify either the local mount directory, or the server hostname and
 export pathname, but not both, during a remount.  For example,
 .P

-.NF
-.TA 2.5i
+.nf
+.ta 8n

        mount -o remount,ro /mnt
        mount -o remount,ro /mnt

-.FI
+.fi

 .P
 merges the mount option
 .B ro
 .P
 merges the mount option
 .B ro