summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/mount_nfs/mount_nfs.812
-rw-r--r--share/man/man5/rc.conf.557
2 files changed, 58 insertions, 11 deletions
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 3933430..59d6cb4 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -28,7 +28,7 @@
.\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95
.\" $FreeBSD$
.\"
-.Dd July 28, 2009
+.Dd April 27, 2011
.Dt MOUNT_NFS 8
.Os
.Sh NAME
@@ -63,6 +63,12 @@ It implements the mount protocol as described in RFC 1094, Appendix A and
.%T "NFS: Network File System Version 3 Protocol Specification" ,
Appendix I.
.Pp
+If the file system type is specified as ``oldnfs'', which implies this
+command is run as ``mount_oldnfs'', then it forces use of the old NFS
+client, which does not support the
+.Cm nfsv4
+option.
+.Pp
By default,
.Nm
keeps retrying until the mount succeeds.
@@ -163,10 +169,8 @@ Note that NFS version 2 has a file size limit of 2 gigabytes.
Use the NFS Version 3 protocol.
.It Cm nfsv4
Use the NFS Version 4 protocol.
-This option will force the mount to use the experimental nfs subsystem and
+This option will force the mount to use
TCP transport.
-To use the experimental nfs subsystem for nfsv2 and nfsv3 mounts, you
-must specify the ``newnfs'' file system type instead of ``nfs''.
.It Cm noconn
For UDP mount points, do not do a
.Xr connect 2 .
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index ff731dd..16f247b 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 22, 2011
+.Dd April 27, 2011
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -2024,20 +2024,63 @@ is set to
these are the flags to pass to the
.Xr nfsd 8
daemon.
-.It Va idmapd_enable
+.It Va nfsv4_server_enable
.Pq Vt bool
-If set to
+If
+.Va nfs_server_enable
+is set to
+.Dq Li YES
+and
+.Va nfsv4_server_enable
+are set to
+.Dq Li YES ,
+enable the server for NFSv4 as well as NFSv2 and NFSv3.
+.It Va nfsuserd_enable
+.Pq Vt bool
+If
+.Va nfsuserd_enable
+is set to
+.Dq Li YES ,
+run the nfsuserd daemon, which is needed for NFSv4 in order
+to map between user/group names vs uid/gid numbers.
+If
+.Va nfsv4_server_enable
+is set to
.Dq Li YES ,
-run the ID mapping daemon for NFS version 4.
-.It Va idmapd_flags
+this will be forced enabled.
+.It Va nfsuserd_flags
.Pq Vt str
If
-.Va idmapd_enable
+.Va nfsuserd_enable
is set to
.Dq Li YES ,
these are the flags to pass to the
-.Xr idmapd 8
+.Xr nfsuserd 8
daemon.
+.It Va nfscbd_enable
+.Pq Vt bool
+If
+.Va nfscbd_enable
+is set to
+.Dq Li YES ,
+run the nfscbd daemon, which enables callbacks/delegations for the NFSv4 client.
+.It Va nfscbd_flags
+.Pq Vt str
+If
+.Va nfscbd_enable
+is set to
+.Dq Li YES ,
+these are the flags to pass to the
+.Xr nfscbd 8
+daemon.
+.It Va oldnfs_server_enable
+.Pq Vt bool
+If
+.Va oldnfs_server_enable
+is set to
+.Dq Li YES ,
+force the NFS server daemons to run the old NFS server code
+that does not support NFSv4.
.It Va mountd_enable
.Pq Vt bool
If set to
OpenPOWER on IntegriCloud