X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fstropts.c;h=ca79ce081aac2cea3634ba192d7d83a6753be6b4;hp=c11420069d97e363d456eb2c998c8e0054cfd03d;hb=6ba0c8306ff8ed0e1233e593bf55d56b017e922b;hpb=4b87dabfab2197323bf39865ec9ad8fc1788230e

diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index c114200..ca79ce0 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -37,6 +37,7 @@
 #include "nls.h"
 #include "nfs_mount.h"
 #include "mount_constants.h"
+#include "stropts.h"
 #include "error.h"
 #include "network.h"
 
@@ -254,17 +255,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) {
@@ -290,20 +287,16 @@ fail:
  * @extra_opts:	pointer to C string containing fs-specific mount options
  *		(possibly also a return argument)
  * @fake:	flag indicating whether to carry out the whole operation
- * @bg:		one if this is a backgrounded mount attempt
+ * @child:	one if this is a backgrounded mount
  *
  * XXX: need to handle bg, fg, and retry options.
  *
  */
 int nfs4mount_s(const char *spec, const char *node, int flags,
-		char **extra_opts, int fake)
+		char **extra_opts, int fake, int child)
 {
 	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 +306,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) {