X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fmount.c;h=72cb89d7602ef6c0f00ea686d58f2a9d8443b01e;hp=639ff4bcb9999335506828d70ce8df02978c1d7e;hb=4af6588d57ab60454500b6789c87586bf0f69fe3;hpb=880305fe1659ab289a917c7627aa014343f46bc9

diff --git a/utils/mount/mount.c b/utils/mount/mount.c
index 639ff4b..72cb89d 100644
--- a/utils/mount/mount.c
+++ b/utils/mount/mount.c
@@ -43,6 +43,7 @@ char *progname;
 int nomtab;
 int verbose;
 int mounttype;
+int sloppy;
 
 static struct option longopts[] = {
   { "fake", 0, 0, 'f' },
@@ -190,6 +191,7 @@ void mount_usage()
 	printf("\t-w\t\tMount file system read-write\n");
 	printf("\t-f\t\tFake mount, don't actually mount\n");
 	printf("\t-n\t\tDo not update /etc/mtab\n");
+	printf("\t-s\t\tTolerate sloppy mount options rather than failing.\n");
 	printf("\t-h\t\tPrint this help\n");
 	printf("\tversion\t\tnfs4 - NFS version 4, nfs - older NFS version supported\n");
 	printf("\tnfsoptions\tRefer mount.nfs(8) or nfs(5)\n\n");
@@ -311,7 +313,7 @@ int main(int argc, char *argv[])
 		return 0;
 	}
 
-	while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:h",
+	while ((c = getopt_long (argc - 2, argv + 2, "rt:vVwfno:hs",
 				longopts, NULL)) != -1) {
 		switch (c) {
 		case 'r':
@@ -341,6 +343,9 @@ int main(int argc, char *argv[])
 			else
 				mount_opts = xstrdup(optarg);
 			break;
+		case 's':
+			++sloppy;
+			break;
 		case 128: /* bind */
 			mounttype = MS_BIND;
 			break;
@@ -387,19 +392,25 @@ int main(int argc, char *argv[])
 			start_statd();
 	}
 
-	if (!mnt_err && !fake) {
-		mnt_err = do_mount_syscall(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
-		
-		if(mnt_err) {
-			mount_error(mount_point);
-			exit(-1);
-		}
+	if (fake)
+		return 0;
+	if (mnt_err)
+		exit(EX_FAIL);
 
-		if(!nomtab)
-			add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
-				 flags, extra_opts, 0, 0);
+	mnt_err = do_mount_syscall(spec, mount_point,
+				   nfs_mount_vers == 4 ? "nfs4" : "nfs",
+				   flags, mount_opts);
+		
+	if (mnt_err) {
+		mount_error(mount_point);
+		exit(EX_FAIL);
 	}
 
+	if (!nomtab)
+		add_mtab(spec, mount_point,
+			 nfs_mount_vers == 4 ? "nfs4" : "nfs",
+			 flags, extra_opts, 0, 0);
+
 	return 0;
 }