diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-21 16:06:56 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-21 16:06:56 +0000 |
| commit | 38a94b57b90fa6d0d0424295113343b7f1417042 (patch) | |
| tree | 690e9d1bc61bef0043224b3fa03791162475ee2e | |
| parent | 61b85d45c4c7ed56fa0e15da3ce706b7ec10b000 (diff) | |
| download | illumos-joyent-38a94b57b90fa6d0d0424295113343b7f1417042.tar.gz | |
OS-5045 manta-nfs client mount doesn't work inside lx zone
Reviewed by: Robert Mustacchi <rm@joyent.com>
| -rw-r--r-- | usr/src/lib/brand/lx/lx_brand/common/mount_nfs.c | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/usr/src/lib/brand/lx/lx_brand/common/mount_nfs.c b/usr/src/lib/brand/lx/lx_brand/common/mount_nfs.c index 85df526add..0633c2a74a 100644 --- a/usr/src/lib/brand/lx/lx_brand/common/mount_nfs.c +++ b/usr/src/lib/brand/lx/lx_brand/common/mount_nfs.c @@ -25,7 +25,9 @@ * * Because libnsl (which we need to make RPCs) depends on the netconfig table * (which won't exist inside an lx zone) we provide a built-in default - * netconfig table which we hook into libnsl via the brand callbacks. + * netconfig table which we hook into libnsl via the brand callbacks. See + * _nsl_brand_set_hooks(lx_nsl_set_sz_func, lx_get_ent_func) + * in lx_nfs_mount(). * * Finally, in most of the functions below, when the code refers to the * hostname we're really working with the IP addr that the Linux user-level @@ -82,6 +84,7 @@ #include <nfs/nfssys.h> #include <strings.h> #include <sys/lx_mount.h> +#include <sys/lx_misc.h> #ifndef NFS_VERSMAX #define NFS_VERSMAX 4 @@ -160,9 +163,9 @@ static nfs_map_opt_t nmo_tab[] = { {"minorversion", NULL, MOUNT_OPT_INVALID}, {"mountaddr", NULL, MOUNT_OPT_INVALID}, {"mounthost", NULL, MOUNT_OPT_INVALID}, - {"mountport", NULL, MOUNT_OPT_INVALID}, - {"mountproto", NULL, MOUNT_OPT_INVALID}, - {"mountvers", NULL, MOUNT_OPT_INVALID}, + {"mountport", NULL, MOUNT_OPT_PASTHRU}, + {"mountproto", NULL, MOUNT_OPT_PASTHRU}, + {"mountvers", NULL, MOUNT_OPT_PASTHRU}, {"namlen", NULL, MOUNT_OPT_INVALID}, {"nfsvers", NULL, MOUNT_OPT_INVALID}, {"noac", NULL, MOUNT_OPT_PASTHRU}, @@ -2030,6 +2033,11 @@ get_nfs_kv(char *vs, char **kp, char **vp) * * example input string, given 'nolock' as the only user-level option: * nolock,vers=4,addr=127.0.0.1,clientaddr=0.0.0.0 + * + * opt string (all one line) from a Centos 6 distro given 'nolock,vers=3' as + * the explicit options: + * nolock,addr=127.0.0.1,vers=3,proto=tcp,mountvers=3,mountproto=tcp, + * mountport=1892 */ static int convert_nfs_arg_str(char *srcp, char *mntopts) @@ -2074,11 +2082,20 @@ convert_nfs_arg_str(char *srcp, char *mntopts) */ } else if (strcmp(key, "vers") == 0) { /* - * This should always be passed and is the - * only vers we want to support. + * This may be implicitly or explicitly passed. + * Check for the versions we want to support. */ - if (atoi(val) != 4) + int r; + int v = atoi(val); + + if (v != 3 && v != 4) return (-EINVAL); + + r = append_opt(mntopts, MAX_MNTOPT_STR, + key, val); + if (r != 0) + return (r); + } else if (strcmp(key, "sec") == 0) { no_sec = B_FALSE; } else { |