From: Chuck Lever <chuck.lever@oracle.com>
Date: Wed, 10 Oct 2007 19:06:37 +0000 (-0400)
Subject: text-based mount.nfs: Use helpers for invoking mount(2) system call
X-Git-Tag: nfs-utils-1-1-1~19
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=9996ea948dd791066b190c5112d59b8e2ffcc9cc

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>
---

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: