From: Karel Zak <kzak@redhat.com>
Date: Mon, 25 Jul 2011 10:37:56 +0000 (+0200)
Subject: mount: remove 'seclabel' mount option on remount
X-Git-Tag: v2.20-rc1~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb46809f7da1a0556903290c924ce02a33e39783;p=thirdparty%2Futil-linux.git

mount: remove 'seclabel' mount option on remount

Reported-by: Daniel Drake <dsd@laptop.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/mount/mount.c b/mount/mount.c
index ea2c47822e..5278253bfc 100644
--- a/mount/mount.c
+++ b/mount/mount.c
@@ -431,7 +431,8 @@ static char *remove_context_options(char *opts)
 		if (strncmp(begin, "context=", 8) == 0 ||
 		    strncmp(begin, "fscontext=", 10) == 0 ||
 		    strncmp(begin, "defcontext=", 11) == 0 ||
-	            strncmp(begin, "rootcontext=", 12) == 0) {
+	            strncmp(begin, "rootcontext=", 12) == 0 ||
+		    strncmp(begin, "seclabel", 8) == 0) {
 			size_t sz;
 
 			if ((begin == opts || *(begin - 1) == ',') && *end == ',')