svn commit: r192993 - in head/usr.sbin: mountd nfsd

[Rick Macklem]

Author: rmacklem
Date: Thu May 28 20:28:13 2009
New Revision: 192993
URL: http://svn.freebsd.org/changeset/base/192993

Log:
  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)

Modified:
  head/usr.sbin/mountd/mountd.8
  head/usr.sbin/mountd/mountd.c
  head/usr.sbin/nfsd/nfsd.8
  head/usr.sbin/nfsd/nfsd.c

Modified: head/usr.sbin/mountd/mountd.8
==============================================================================
--- head/usr.sbin/mountd/mountd.8	Thu May 28 20:21:01 2009	(r192992)
+++ head/usr.sbin/mountd/mountd.8	Thu May 28 20:28:13 2009	(r192993)
@@ -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
 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 followi
 # 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.

Modified: head/usr.sbin/mountd/mountd.c
==============================================================================
--- head/usr.sbin/mountd/mountd.c	Thu May 28 20:21:01 2009	(r192992)
+++ head/usr.sbin/mountd/mountd.c	Thu May 28 20:28:13 2009	(r192993)
@@ -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);
 }

Modified: head/usr.sbin/nfsd/nfsd.8
==============================================================================
--- head/usr.sbin/nfsd/nfsd.8	Thu May 28 20:21:01 2009	(r192992)
+++ head/usr.sbin/nfsd/nfsd.8	Thu May 28 20:28:13 2009	(r192993)
@@ -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.

Modified: head/usr.sbin/nfsd/nfsd.c
==============================================================================
--- head/usr.sbin/nfsd/nfsd.c	Thu May 28 20:21:01 2009	(r192992)
+++ head/usr.sbin/nfsd/nfsd.c	Thu May 28 20:28:13 2009	(r192993)
@@ -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".
 	 */