Attachment 145339 Details for Bug 192379 – Provide -o vers= compatibility for mount_nfs

Provide -o vers= compatibility for mount_nfs

20140804-01-mount_nfs.diff (text/plain), 2.35 KB, created by Bjoern A. Zeeb on 2014-08-04 12:41:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bjoern A. Zeeb

Created: 2014-08-04 12:41:44 UTC

Size: 2.35 KB

patch

obsolete

>!
>! Provide Solaris, Linux, OSX -o vers= compatibility.
>!
>! Submitted by:	bz
>! Sponsored by:	DARPA,AFRL
>!
>Index: sbin/mount_nfs/mount_nfs.8
>===================================================================
>--- sbin/mount_nfs/mount_nfs.8	(revision 268937)
>+++ sbin/mount_nfs/mount_nfs.8	(working copy)
>@@ -28,7 +28,7 @@
> .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
> .\" $FreeBSD$
> .\"
>-.Dd December 7, 2013
>+.Dd August 4, 2014
> .Dt MOUNT_NFS 8
> .Os
> .Sh NAME
>@@ -371,6 +371,14 @@ tune the timeout
> interval.)
> .It Cm udp
> Use UDP transport.
>+.It Cm vers Ns = Ns Aq Ar vers_number
>+Use specified version number for NFS requests.
>+See
>+.Cm nfsv2 ,
>+.Cm nfsv3 ,
>+and 
>+.Cm nfsv4
>+options for details.
> .It Cm wcommitsize Ns = Ns Aq Ar value
> Set the maximum pending write commit size to the specified value.
> This determines the maximum amount of pending write data that the NFS
>@@ -466,6 +474,26 @@ Same as
> Same as
> .Fl o Cm retrans Ns = Ns Aq Ar value
> .El
>+.Pp
>+The following
>+.Fl o
>+named options are equivalent to other
>+.Fl o
>+named options and are supported for compatibility with other
>+operating systems (e.g., Linux, Solaris, and OSX) to ease usage of
>+.Xr autofs 5
>+support.
>+.Bl -tag -width indent
>+.It Fl o Cm vers Ns = Ns 2
>+Same as
>+.Fl o Cm nfsv2
>+.It Fl o Cm vers Ns = Ns 3
>+Same as
>+.Fl o Cm nfsv3
>+.It Fl o Cm vers Ns = Ns 4
>+Same as
>+.Fl o Cm nfsv4
>+.El
> .Sh SEE ALSO
> .Xr nmount 2 ,
> .Xr unmount 2 ,
>Index: sbin/mount_nfs/mount_nfs.c
>===================================================================
>--- sbin/mount_nfs/mount_nfs.c	(revision 268937)
>+++ sbin/mount_nfs/mount_nfs.c	(working copy)
>@@ -310,6 +310,29 @@ main(int argc, char *argv[])
> 					if (*p || num <= 0)
> 						errx(1, "illegal maxgroups value -- %s", val);
> 					//set_rpc_maxgrouplist(num);
>+				} else if (strcmp(opt, "vers") == 0) {
>+					num = strtol(val, &p, 10);
>+					switch (num) {
>+					case 2:
>+						mountmode = V2;
>+						break;
>+					case 3:
>+						mountmode = V3;
>+						build_iovec(&iov, &iovlen,
>+						    "nfsv3", NULL, 0);
>+						break;
>+					case 4:
>+						mountmode = V4;
>+						fstype = "nfs";
>+						nfsproto = IPPROTO_TCP;
>+						if (portspec == NULL)
>+							portspec = "2049";
>+						break;
>+					default:
>+						errx(1, "illegal nfs version "
>+						    "value -- %s", val);
>+					}
>+					pass_flag_to_nmount=0;
> 				}
> 				if (pass_flag_to_nmount)
> 					build_iovec(&iov, &iovlen, opt, val,

Actions: View

Attachments on bug 192379: 145339