From: Raghavendra D Prabhu <rprabhu@wnohang.net>
Date: Sun, 26 Feb 2012 11:06:42 +0000 (+0530)
Subject: mount: (new) add 'internal-only(i)' to non-root allowed options
X-Git-Tag: v2.22-rc1~740
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d0ad9875af9e478cd2577ac42041b16170a691;p=thirdparty%2Futil-linux.git

mount: (new) add 'internal-only(i)' to non-root allowed options

Commit ce433404 introduced the change, which causes something like mount -i
<user-mount-path> to break which worked well before util-linux-2.21, now it
gives message 'mount: only root can use "--internal-only" option' when that
shouldn't be the case when it is already in fstab.

Signed-off-by: Raghavendra D Prabhu <rprabhu@wnohang.net>
---

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 23abc91735..8f5dcdbd6a 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -712,7 +712,7 @@ int main(int argc, char **argv)
 					longopts, NULL)) != -1) {
 
 		/* only few options are allowed for non-root users */
-		if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpr", c))
+		if (mnt_context_is_restricted(cxt) && !strchr("hlLUVvpri", c))
 			exit_non_root(option_to_longopt(c, longopts));
 
 		switch(c) {