libmount: remove fstab.d support

If you really need to store your configuration to a alternative files
then you have to explicitly specify the files or directories on
mount(8) command line by --fstab option.

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-01-24 11:16:53 +01:00
parent b9f23bf7ff
commit 9354fea342
4 changed files with 2 additions and 20 deletions

View File

@ -102,7 +102,7 @@ mnt_debug_h(void *handler, const char *mesg, ...)
# define DBG_FLUSH do { ; } while(0)
#endif
/* extension for files in the /etc/fstab.d directory */
/* extension for files in the directory */
#define MNT_MNTTABDIR_EXT ".fstab"
/* library private paths */

View File

@ -680,10 +680,6 @@ int mnt_table_parse_fstab(struct libmnt_table *tb, const char *filename)
else
rc = -EINVAL;
if (rc == 0 && strcmp(filename, _PATH_MNTTAB) == 0) {
if (!access(_PATH_MNTTAB_DIR, R_OK))
rc = mnt_table_parse_dir(tb, _PATH_MNTTAB_DIR);
}
return rc;
}

View File

@ -22,7 +22,6 @@ will list all mounted filesytems or search for a filesystem. The
.B findmnt
command is able to search in
.IR /etc/fstab ,
.IR /etc/fstab.d ,
.IR /etc/mtab
or
.IR /proc/self/mountinfo .
@ -38,9 +37,7 @@ The command prints all mounted filesystems in the tree-like format by default.
Print help and exit.
.IP "\fB\-s, \-\-fstab\fP"
Search in
.IR /etc/fstab
and
.IR /etc/fstab.d .
.IR /etc/fstab .
The output is in the list format (see --list).
.IP "\fB\-m, \-\-mtab\fP"
Search in

View File

@ -175,14 +175,6 @@ mounted where, using which options. The default location of the
.BR fstab (5)
file could be overrided by --fstab <path> command line option (see below for
more details).
If the
.B mount
command is linked with libmount, then filesystems could be also defined in
.I /etc/fstab.d/*.fstab
files. See
.BR fstab (5)
for more details.
.LP
The command
.RS
@ -2784,9 +2776,6 @@ support (for example /sbin/mount.fuse -t fuse.sshfs).
.I /etc/fstab
filesystem table
.TP
.I /etc/fstab.d
directory with filesystem tables
.TP
.I /etc/mtab
table of mounted filesystems
.TP