From: Chuck Lever <chuck.lever@oracle.com>
Date: Tue, 21 Aug 2007 16:19:18 +0000 (-0400)
Subject: mount.nfs: Combine two verbose messages into one
X-Git-Tag: nfs-utils-1-1-1~68
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=798d0f1244ad4b77f1862c670ada16780c26a7af;ds=sidebyside

mount.nfs: Combine two verbose messages into one

A little less noise.

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 c114200..95392a1 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -254,17 +254,13 @@ int nfsmount_s(const char *spec, const char *node, int flags,
 {
 	int retval = EX_FAIL;
 
-	if (verbose)
-		printf(_("%s: using C string mount system call interface\n"),
-			progname);
-
 	extract_interesting_options(*extra_opts);
 
 	if (!addr_opt && !append_addr_opt(spec, extra_opts))
 		goto fail;
 
 	if (verbose)
-		printf(_("%s: option string is '%s'\n"),
+		printf(_("%s: text-based options: '%s'\n"),
 			progname, *extra_opts);
 
 	if (!fake) {
@@ -300,10 +296,6 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 {
 	int retval = EX_FAIL;
 
-	if (verbose)
-		printf(_("%s: using C string mount system call interface\n"),
-			progname);
-
 	extract_interesting_options(*extra_opts);
 
 	if (!addr_opt && !append_addr_opt(spec, extra_opts))
@@ -313,7 +305,7 @@ int nfs4mount_s(const char *spec, const char *node, int flags,
 		goto fail;
 
 	if (verbose)
-		printf(_("%s: option string is '%s'\n"),
+		printf(_("%s: text-based options: '%s'\n"),
 			progname, *extra_opts);
 
 	if (!fake) {