diff options
| author | Matthias Andree <matthias.andree@gmx.de> | 2006-06-10 16:08:18 +0200 |
|---|---|---|
| committer | Matthias Andree <matthias.andree@gmx.de> | 2006-06-10 16:08:18 +0200 |
| commit | abcfdfda7a5932cbb27ff243ed962119db2599a4 (patch) | |
| tree | 40a69e508099b74048e298b63c27359989eeff79 | |
| parent | aadac9b7bbe7d1f4f0db02f3d7dbd70a856f9153 (diff) | |
| download | e2fsprogs-abcfdfda7a5932cbb27ff243ed962119db2599a4.tar.gz | |
Read mke2fs.conf and e2fsck.conf from root_sysconfdir rather than harcoded /etc.
| -rw-r--r-- | MCONFIG.in | 2 | ||||
| -rw-r--r-- | e2fsck/unix.c | 2 | ||||
| -rw-r--r-- | misc/mke2fs.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -33,7 +33,7 @@ datadir = @datadir@ CC = @CC@ BUILD_CC = @BUILD_CC@ -DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ +DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@ CFLAGS = @CFLAGS@ CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@ INTL_FLAGS = @INTL_FLAGS@ diff --git a/e2fsck/unix.c b/e2fsck/unix.c index 9e722f41..77f56f6d 100644 --- a/e2fsck/unix.c +++ b/e2fsck/unix.c @@ -568,7 +568,7 @@ static void syntax_err_report(const char *filename, long err, int line_num) exit(FSCK_ERROR); } -static const char *config_fn[] = { "/etc/e2fsck.conf", 0 }; +static const char *config_fn[] = { ROOT_SYSCONFDIR "/e2fsck.conf", 0 }; static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx) { diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 5c59b488..0004c012 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -870,7 +870,7 @@ static void syntax_err_report(const char *filename, long err, int line_num) exit(1); } -static const char *config_fn[] = { "/etc/mke2fs.conf", 0 }; +static const char *config_fn[] = { ROOT_SYSCONFDIR "/mke2fs.conf", 0 }; static void edit_feature(const char *str, __u32 *compat_array) { |