summaryrefslogtreecommitdiffstats
path: root/usr.sbin/nfsd
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2009-05-28 20:28:13 +0000
committerrmacklem <rmacklem@FreeBSD.org>2009-05-28 20:28:13 +0000
commit8bb7f959a696a1faa13c049c0471f46f3e88c2fe (patch)
tree8909b4c2afab3f9405ccffbaf4626a59096edb91 /usr.sbin/nfsd
parent19b8da41e5c23d3a8360ce26555d1e30a3d736be (diff)
downloadFreeBSD-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/nfsd')
-rw-r--r--usr.sbin/nfsd/nfsd.84
-rw-r--r--usr.sbin/nfsd/nfsd.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/nfsd/nfsd.8 b/usr.sbin/nfsd/nfsd.8
index 3c2dcd4..c384557 100644
--- a/usr.sbin/nfsd/nfsd.8
+++ b/usr.sbin/nfsd/nfsd.8
@@ -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.
diff --git a/usr.sbin/nfsd/nfsd.c b/usr.sbin/nfsd/nfsd.c
index 9afe62c..0da53cf 100644
--- a/usr.sbin/nfsd/nfsd.c
+++ b/usr.sbin/nfsd/nfsd.c
@@ -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".
*/
OpenPOWER on IntegriCloud