Modify mountd to handle the experimental nfs server as well as the

regular one. It now takes a "-4" command line argument to force it
to use the experimental server. Otherwise it will use the regular
server unless the experimental server is the only one linked into
the kernel. A third kind of line has been added to /etc/exports,
which is specific to NFSv4 and defines where the NFSv4 tree root is
and can be used to limit access to NFSv4 state handling operations
that do not use any file handle.

Approved by:	kib (mentor)

1 files changed, 14 insertions, 1 deletions

diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8
index 4f1d614..4b74d43 100644
--- a/usr.sbin/mountd/mountd.8
+++ b/usr.sbin/mountd/mountd.8
@@ -38,7 +38,7 @@
 mount requests
 .Sh SYNOPSIS
 .Nm
-.Op Fl 2dlnr
+.Op Fl 24dlnr
 .Op Fl h Ar bindip
 .Op Fl p Ar port
 .Op Ar exportsfile ...
@@ -63,6 +63,18 @@ Allow the administrator to force clients to use only the
 version 2
 .Tn NFS
 protocol to mount file systems from this server.
+.It Fl 4
+Forces
+.Nm
+to try and start the experimental server that includes NFSv4 support in it.
+If this flag isn't specified, the experimental server will only be started
+if it is linked into the kernel and the regular one isn't.
+.br
+ie. The kernel is built with the following:
+.Bd -literal -offset indent -compact
+# options	NFSSERVER
+options		NFSD
+.Ed
 .It Fl d
 Output debugging information.
 .Nm
@@ -171,6 +183,7 @@ the current list of remote mounted file systems
 .Sh SEE ALSO
 .Xr nfsstat 1 ,
 .Xr kldload 2 ,
+.Xr nfsv4 4 ,
 .Xr exports 5 ,
 .Xr nfsd 8 ,
 .Xr rpcbind 8 ,