summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChuck Lever <chuck.lever@oracle.com>2007-10-10 15:06:37 -0400
committerNeil Brown <neilb@suse.de>2007-10-11 11:03:18 +1000
commit9996ea948dd791066b190c5112d59b8e2ffcc9cc (patch)
tree4d583fc936739bc32b9d75429347107579249226
parent56cfa1320a00cec885fbdf51c54b72acb01a95c0 (diff)
downloadnfs-utils-9996ea948dd791066b190c5112d59b8e2ffcc9cc.tar.gz
nfs-utils-9996ea948dd791066b190c5112d59b8e2ffcc9cc.tar.xz
nfs-utils-9996ea948dd791066b190c5112d59b8e2ffcc9cc.zip
text-based mount.nfs: Use helpers for invoking mount(2) system call
Expose support for NFS version and transport protocol fallback for NFSv2/3 mounts. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: Neil Brown <neilb@suse.de>
-rw-r--r--utils/mount/stropts.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index 1d2cde6..13523f8 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -538,23 +538,11 @@ int nfsmount_string(const char *spec, const char *node, const char *type,
if (!set_mandatory_options(type, &saddr, options))
goto out;
- if (po_join(options, extra_opts) == PO_FAILED) {
- nfs_error(_("%s: internal option parsing error"), progname);
+ if (try_mount(spec, node, type, flags, options, fake, extra_opts)) {
+ mount_error(spec, node, errno);
goto out;
}
- if (verbose)
- printf(_("%s: text-based options: '%s'\n"),
- progname, *extra_opts);
-
- if (!fake) {
- if (mount(spec, node, type,
- flags & ~(MS_USER|MS_USERS), *extra_opts)) {
- mount_error(spec, node, errno);
- goto out;
- }
- }
-
retval = EX_SUCCESS;
out: