findmnt: add note about mount options

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

diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 6e4ddb470f9e5e45fb529e7eb35559f0ea61fb34..6fc7da59ead70e612411a68952f7d0030cfdf8e9 100644 (file)
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -95,7 +95,8 @@ Use JSON output format.
 .BR \-k , " \-\-kernel"
 Search in
 .IR /proc/self/mountinfo .
-The output is in the tree-like format.  This is the default.
+The output is in the tree-like format.  This is the default.  The output
+contains only mount options maintained by kernel (see also \fB\-\-mtab)\fP.
 .TP
 .BR \-l , " \-\-list"
 Use the list output format.  This output format is automatically enabled if the
@@ -109,7 +110,8 @@ Explicitly define the mountpoint file or directory.  See also \fB\-\-target\fP.
 .BR \-m , " \-\-mtab"
 Search in
 .IR /etc/mtab .
-The output is in the list format (see \fB\-\-list\fP).
+The output is in the list format (see \fB\-\-list\fP).  The output may include user
+space mount options.
 .TP
 .BR \-N , " \-\-task \fItid\fP"
 Use alternative namespace /proc/<tid>/mountinfo rather than the default

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index ea4d23d8e18971a577278f63d656ecd9c62f2c8e..f2c0b27b41a8b8f5de86f4c49d269f7f77d4fc66 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -1194,7 +1194,8 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
 
        fputs(USAGE_OPTIONS, out);
        fputs(_(" -s, --fstab            search in static table of filesystems\n"), out);
-       fputs(_(" -m, --mtab             search in table of mounted filesystems\n"), out);
+       fputs(_(" -m, --mtab             search in table of mounted filesystems\n"
+               "                          (includes user space mount options)\n"), out);
        fputs(_(" -k, --kernel           search in kernel table of mounted\n"
                "                          filesystems (default)\n"), out);
        fputc('\n', out);