diff options
| author | Karel Zak | 2012-01-24 11:16:53 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-01-24 11:16:53 +0100 |
| commit | 9354fea34283f54e45fb7d6faa7b54f516081780 (patch) | |
| tree | 8e767c601742ba4081f0d076c7ba11b14c32d036 | |
| parent | Revert "mount: enable fstab.d" (diff) | |
| download | kernel-qcow2-util-linux-9354fea34283f54e45fb7d6faa7b54f516081780.tar.gz kernel-qcow2-util-linux-9354fea34283f54e45fb7d6faa7b54f516081780.tar.xz kernel-qcow2-util-linux-9354fea34283f54e45fb7d6faa7b54f516081780.zip | |
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>
| -rw-r--r-- | libmount/src/mountP.h | 2 | ||||
| -rw-r--r-- | libmount/src/tab_parse.c | 4 | ||||
| -rw-r--r-- | misc-utils/findmnt.8 | 5 | ||||
| -rw-r--r-- | sys-utils/mount.8 | 11 |
4 files changed, 2 insertions, 20 deletions
diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h index 05a13d5de..fa0edf50c 100644 --- 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 aba4d68fa..8c5b23c29 100644 --- 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 4345af35c..b6d80f095 100644 --- 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 9cc4a9f18..a063434bb 100644 --- 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 |