diff options
author | rmacklem <rmacklem@FreeBSD.org> | 2009-05-28 20:28:13 +0000 |
---|---|---|
committer | rmacklem <rmacklem@FreeBSD.org> | 2009-05-28 20:28:13 +0000 |
commit | 8bb7f959a696a1faa13c049c0471f46f3e88c2fe (patch) | |
tree | 8909b4c2afab3f9405ccffbaf4626a59096edb91 /usr.sbin/mountd | |
parent | 19b8da41e5c23d3a8360ce26555d1e30a3d736be (diff) | |
download | FreeBSD-src-8bb7f959a696a1faa13c049c0471f46f3e88c2fe.zip FreeBSD-src-8bb7f959a696a1faa13c049c0471f46f3e88c2fe.tar.gz |
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)
Diffstat (limited to 'usr.sbin/mountd')
-rw-r--r-- | usr.sbin/mountd/mountd.8 | 14 | ||||
-rw-r--r-- | usr.sbin/mountd/mountd.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/usr.sbin/mountd/mountd.8 b/usr.sbin/mountd/mountd.8 index 4b74d43..17527fd 100644 --- a/usr.sbin/mountd/mountd.8 +++ b/usr.sbin/mountd/mountd.8 @@ -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. diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 84f77f0..6977b93 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -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); } |