Change the "-4" argument for nfsd and mountd to "-e" to avoid
confusion, since it does not refer to IPv4 nor NFSv4, but to running the experimental server instead of the regular one. Approved by: kib (mentor)
This commit is contained in:
parent
8ea36d1e2b
commit
2179ae1ebf
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=192993
@ -38,7 +38,7 @@
|
||||
mount requests
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl 24dlnr
|
||||
.Op Fl 2delnr
|
||||
.Op Fl h Ar bindip
|
||||
.Op Fl p Ar port
|
||||
.Op Ar exportsfile ...
|
||||
@ -63,7 +63,12 @@ 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
|
||||
.It Fl d
|
||||
Output debugging information.
|
||||
.Nm
|
||||
will not detach from the controlling terminal and will print
|
||||
debugging messages to stderr.
|
||||
.It Fl e
|
||||
Forces
|
||||
.Nm
|
||||
to try and start the experimental server that includes NFSv4 support in it.
|
||||
@ -75,11 +80,6 @@ ie. The kernel is built with the following:
|
||||
# options NFSSERVER
|
||||
options NFSD
|
||||
.Ed
|
||||
.It Fl d
|
||||
Output debugging information.
|
||||
.Nm
|
||||
will not detach from the controlling terminal and will print
|
||||
debugging messages to stderr.
|
||||
.It Fl h Ar bindip
|
||||
Specify specific IP addresses to bind to for TCP and UDP requests.
|
||||
This option may be specified multiple times.
|
||||
|
@ -297,12 +297,12 @@ main(argc, argv)
|
||||
else
|
||||
close(s);
|
||||
|
||||
while ((c = getopt(argc, argv, "24dh:lnp:r")) != -1)
|
||||
while ((c = getopt(argc, argv, "2deh:lnp:r")) != -1)
|
||||
switch (c) {
|
||||
case '2':
|
||||
force_v2 = 1;
|
||||
break;
|
||||
case '4':
|
||||
case 'e':
|
||||
run_v4server = 1;
|
||||
break;
|
||||
case 'n':
|
||||
@ -351,7 +351,7 @@ main(argc, argv)
|
||||
};
|
||||
|
||||
/*
|
||||
* If the "-4" option was specified OR only the nfsd module is
|
||||
* If the "-e" option was specified OR only the nfsd module is
|
||||
* found in the server, run "nfsd".
|
||||
* Otherwise, try and run "nfsserver".
|
||||
*/
|
||||
@ -733,7 +733,7 @@ static void
|
||||
usage()
|
||||
{
|
||||
fprintf(stderr,
|
||||
"usage: mountd [-2] [-4] [-d] [-l] [-n] [-p <port>] [-r] "
|
||||
"usage: mountd [-2] [-d] [-e] [-l] [-n] [-p <port>] [-r] "
|
||||
"[-h <bindip>] [export_file ...]\n");
|
||||
exit(1);
|
||||
}
|
||||
|
@ -38,7 +38,7 @@
|
||||
server
|
||||
.Sh SYNOPSIS
|
||||
.Nm
|
||||
.Op Fl ardut4
|
||||
.Op Fl ardute
|
||||
.Op Fl n Ar num_servers
|
||||
.Op Fl h Ar bindip
|
||||
.Sh DESCRIPTION
|
||||
@ -100,7 +100,7 @@ clients.
|
||||
Serve
|
||||
.Tn UDP NFS
|
||||
clients.
|
||||
.It Fl 4
|
||||
.It Fl e
|
||||
Forces
|
||||
.Nm
|
||||
to try and start the experimental server that includes NFSv4 support in it.
|
||||
|
@ -117,7 +117,7 @@ void usage(void);
|
||||
* -d - unregister with rpcbind
|
||||
* -t - support tcp nfs clients
|
||||
* -u - support udp nfs clients
|
||||
* -4 - forces it to run a server that supports nfsv4
|
||||
* -e - forces it to run a server that supports nfsv4
|
||||
* followed by "n" which is the number of nfsds' to fork off
|
||||
*/
|
||||
int
|
||||
@ -144,8 +144,8 @@ main(int argc, char **argv)
|
||||
nfsdcnt = DEFNFSDCNT;
|
||||
unregister = reregister = tcpflag = maxsock = 0;
|
||||
bindanyflag = udpflag = connect_type_cnt = bindhostc = 0;
|
||||
#define GETOPT "ah:n:rdtu4"
|
||||
#define USAGE "[-ardtu4] [-n num_servers] [-h bindip]"
|
||||
#define GETOPT "ah:n:rdtue"
|
||||
#define USAGE "[-ardtue] [-n num_servers] [-h bindip]"
|
||||
while ((ch = getopt(argc, argv, GETOPT)) != -1)
|
||||
switch (ch) {
|
||||
case 'a':
|
||||
@ -180,7 +180,7 @@ main(int argc, char **argv)
|
||||
case 'u':
|
||||
udpflag = 1;
|
||||
break;
|
||||
case '4':
|
||||
case 'e':
|
||||
run_v4server = 1;
|
||||
break;
|
||||
default:
|
||||
@ -208,7 +208,7 @@ main(int argc, char **argv)
|
||||
}
|
||||
|
||||
/*
|
||||
* If the "-4" option was specified OR only the nfsd module is
|
||||
* If the "-e" option was specified OR only the nfsd module is
|
||||
* found in the server, run "nfsd".
|
||||
* Otherwise, try and run "nfsserver".
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user