diff options
| author | Dave Reisner | 2011-12-11 19:58:05 +0100 |
|---|---|---|
| committer | Karel Zak | 2011-12-16 11:29:39 +0100 |
| commit | d466c6a1fe66603227b3ff73a21a45abd77ee826 (patch) | |
| tree | 71b7b2b572aac648586304038a0786823667105b /misc-utils/findmnt.c | |
| parent | findmnt: use warnx for libmnt error callback (diff) | |
| download | kernel-qcow2-util-linux-d466c6a1fe66603227b3ff73a21a45abd77ee826.tar.gz kernel-qcow2-util-linux-d466c6a1fe66603227b3ff73a21a45abd77ee826.tar.xz kernel-qcow2-util-linux-d466c6a1fe66603227b3ff73a21a45abd77ee826.zip | |
findmnt: support alternative location of fstab
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/findmnt.c')
| -rw-r--r-- | misc-utils/findmnt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 4577dc69a..5502a8780 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -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) */ |