From: Karel Zak <kzak@redhat.com>
Date: Mon, 27 Feb 2012 15:43:12 +0000 (+0100)
Subject: libmount: use mount.<type> -s for NFS only
X-Git-Tag: v2.22-rc1~748
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf9690114b7432144caf815e149e35640bc3ad0;p=thirdparty%2Futil-linux.git

libmount: use mount.<type> -s for NFS only

Unfortunately, it seems that for example mount.cifs don't care about
the API, so we need exception like the original mount(8).

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index 8cbc25b279..a0c5951c1e 100644
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -369,7 +369,12 @@ static int exec_helper(struct libmnt_context *cxt)
 		args[i++] = mnt_fs_get_srcpath(cxt->fs);/* 2 */
 		args[i++] = mnt_fs_get_target(cxt->fs);	/* 3 */
 
-		if (mnt_context_is_sloppy(cxt))
+		/*
+		 * TODO: remove the exception for "nfs", -s is documented
+		 *       for years should be usable everywhere.
+		 */
+		if (mnt_context_is_sloppy(cxt) &&
+		    type && startswith(type, "nfs"))
 			args[i++] = "-s";		/* 4 */
 		if (mnt_context_is_fake(cxt))
 			args[i++] = "-f";		/* 5 */