ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

findmnt: support alternative location of fstab 

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Dave Reisner 2011-12-11 13:58:05 -05:00 committed by Karel Zak
parent b1b9f1c136
commit d466c6a1fe
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc-utils/findmnt.8
View File

@ -36,12 +36,14 @@ The command prints all mounted filesystems in the tree-like format by default.
.SH OPTIONS
.IP "\fB\-h, \-\-help\fP"
Print help and exit.
.IP "\fB\-s, \-\-fstab\fP"
.IP "\fB\-s, \-\-fstab\fR[\fI=fstab\fR]\fP"
Search in
.IR /etc/fstab
and
.IR /etc/fstab.d .
The output is in the list format (see --list).
The output is in the list format (see --list). Optionally, search the file
specified by
.IR fstab .
.IP "\fB\-m, \-\-mtab\fP"
Search in
.IR /etc/mtab .

9
misc-utils/findmnt.c
View File

@ -770,7 +770,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fprintf(out, _(
"\nOptions:\n"
" -s, --fstab search in static table of filesystems\n"
" -s, --fstab[=<fstab>] search in static table of filesystems\n"
" -m, --mtab search in table of mounted filesystems\n"
" -k, --kernel search in kernel table of mounted\n"
" filesystems (default)\n\n"));
@ -839,7 +839,7 @@ int main(int argc, char *argv[])
{ "direction", 1, 0, 'd' },
{ "evaluate", 0, 0, 'e' },
{ "first-only", 0, 0, 'f' },
{ "fstab", 0, 0, 's' },
{ "fstab", 2, 0, 's' },
{ "help", 0, 0, 'h' },
{ "invert", 0, 0, 'i' },
{ "kernel", 0, 0, 'k' },
@ -872,7 +872,8 @@ int main(int argc, char *argv[])
tt_flags |= TT_FL_TREE;
while ((c = getopt_long(argc, argv,
"acd:ehifo:O:p::Pklmnrst:uvRS:T:w:", longopts, NULL)) != -1) {
"acd:ehifo:O:p::Pklmnrs::t:uvRS:T:w:",
longopts, NULL)) != -1) {
switch(c) {
case 'a':
tt_flags |= TT_FL_ASCII;
@ -938,7 +939,7 @@ int main(int argc, char *argv[])
case 's': /* fstab */
if (tabfile)
errx_mutually_exclusive("--{fstab,mtab,kernel}");
tabfile = _PATH_MNTTAB;
tabfile = optarg ? optarg : _PATH_MNTTAB;
tt_flags &= ~TT_FL_TREE;
break;
case 'k': /* kernel (mountinfo) */