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>

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 05a13d5de6f64adb386c0278e46d6c528f6f949d..fa0edf50cdf00a91dfd703dba3cde4bc9ab8f7c9 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -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 */

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index aba4d68fafdd92e2728d79aa5c6f293dd5e8de4a..8c5b23c291716c5faf2eac285d2664f21170627d 100644 (file)
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -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;
 }
 

diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8
index 4345af35c58c83fd94abb6e4179e93ae9762d970..b6d80f0955102a33aa8a186422efc5da1e88a3e7 100644 (file)
--- a/misc-utils/findmnt.8
+++ b/misc-utils/findmnt.8
@@ -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

diff --git a/sys-utils/mount.8 b/sys-utils/mount.8
index 9cc4a9f18eb8efa623acf7435b802709b326780e..a063434bbabc9b94cc13855c697e1da1c65fb363 100644 (file)
--- a/sys-utils/mount.8
+++ b/sys-utils/mount.8
@@ -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