diff options
-rw-r--r-- | sys-utils/mount.8 | 21 | ||||
-rw-r--r-- | sys-utils/mount.c | 7 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sys-utils/mount.8 b/sys-utils/mount.8 index c5f7c1408..3c16a132c 100644 --- a/sys-utils/mount.8 +++ b/sys-utils/mount.8 @@ -678,6 +678,27 @@ 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 contents are available in both places). See above, the subsection diff --git a/sys-utils/mount.c b/sys-utils/mount.c index 7707402f2..4ac14b8ab 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" |