From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Thu, 8 Feb 2018 14:46:33 +0000 (+0100)
Subject: mount: document --options-* in man/help
X-Git-Tag: v2.33-rc1~320^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7238285bf2c6d73a0425791539a9bb668592f7f1;p=thirdparty%2Futil-linux.git

mount: document --options-* in man/help

Signed-off-by: Vaclav Dolezal <vdolezal@redhat.com>
---

diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index c5f7c1408b..3c16a132c0 100644
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -677,6 +677,27 @@ and
 sections.
 .RE
 
+.TP
+.BR "\-\-options\-mode " \fImode
+Controls how to combine options from fstab/mtab with options from command line.
+\fImode\fR can be one of
+.BR ignore ", " append ", " prepend " or " replace .
+Default value is \fBprepend\fR.
+
+.TP
+.BR "\-\-options\-source " \fIsource
+Source of default options.
+\fIsource\fR is comma separated list of
+.BR fstab ", " mtab " and " disable .
+\fBdisable\fR disables
+.BR fstab " and " mtab
+and disables \fB\-\-options\-source\-force\fR.
+Default value is \fBfstab,mtab\fR.
+
+.TP
+.BR \-\-options\-source\-force
+Use options from fstab/mtab even if both \fIdevice\fR and \fIdir\fR are specified.
+
 .TP
 .BR \-R , " \-\-rbind"
 Remount a subtree and all possible submounts somewhere else (so that its
diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 7707402f21..4ac14b8ab1 100644
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -413,6 +413,13 @@ static void __attribute__((__noreturn__)) usage(void)
 	fprintf(out, _(
 	" -n, --no-mtab           don't write to /etc/mtab\n"));
 	fprintf(out, _(
+	"     --options-mode <mode>\n"
+	"                         what to do with options loaded from fstab\n"
+	"     --options-source <source>\n"
+	"                         mount options source\n"
+	"     --options-source-force\n"
+	"                         force use of options from fstab/mtab\n"));
+	fprintf(out, _(
 	" -o, --options <list>    comma-separated list of mount options\n"
 	" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 	" -r, --read-only         mount the filesystem read-only (same as -o ro)\n"