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 /libmount | |
| 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>
Diffstat (limited to 'libmount')
| -rw-r--r-- | libmount/src/mountP.h | 2 | ||||
| -rw-r--r-- | libmount/src/tab_parse.c | 4 |
2 files changed, 1 insertions, 5 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; } |