From: Karel Zak <kzak@redhat.com>
Date: Fri, 18 Mar 2011 08:21:32 +0000 (+0100)
Subject: libmount: rename mount option "quiet" to "silent"
X-Git-Tag: v2.20-rc1~432
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5af1532e05f91a09e8578ffa9d8be716b282f302;p=thirdparty%2Futil-linux.git

libmount: rename mount option "quiet" to "silent"

 See commit 2ac1890aa0d8ce404528587134fcabe0e2834963.

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

diff --git a/shlibs/mount/src/libmount.h.in b/shlibs/mount/src/libmount.h.in
index cb0a28aee9..c9d0ba8f4d 100644
--- a/shlibs/mount/src/libmount.h.in
+++ b/shlibs/mount/src/libmount.h.in
@@ -481,8 +481,8 @@ extern int mnt_context_do_umount(struct libmnt_context *cxt);
 #ifndef MS_REC
 #define MS_REC		0x4000	/* 16384: Recursive loopback */
 #endif
-#ifndef MS_VERBOSE
-#define MS_VERBOSE	0x8000	/* 32768 */
+#ifndef MS_SILENT
+#define MS_SILENT	0x8000	/* 32768 */
 #endif
 #ifndef MS_RELATIME
 #define MS_RELATIME	0x200000 /* 200000: Update access times relative
diff --git a/shlibs/mount/src/optmap.c b/shlibs/mount/src/optmap.c
index 368f2a64d2..89ec101c3f 100644
--- a/shlibs/mount/src/optmap.c
+++ b/shlibs/mount/src/optmap.c
@@ -91,7 +91,7 @@ static const struct libmnt_optmap linux_flags_map[] =
    { "nosub",    MS_NOSUB },                  /* don't allow submounts */
 #endif
 #ifdef MS_SILENT
-   { "quiet",	 MS_SILENT },                 /* be quiet  */
+   { "silent",	 MS_SILENT },                 /* be quiet  */
    { "loud",     MS_SILENT, MNT_INVERT },     /* print out messages. */
 #endif
 #ifdef MS_MANDLOCK