Read mke2fs.conf and e2fsck.conf from root_sysconfdir rather than harcoded /etc.

diff --git a/MCONFIG.in b/MCONFIG.in
index 4afb80a208af96dc8fdc3d40fcc1d6dd6cb706d3..e8b01556995fa8462ef42305246db0de1ceed95f 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -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 9e722f418732bf306d442aa500c8a3ca8e548bf3..77f56f6d2657c7dafed682e0a5576018415acd27 100644 (file)
--- 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 5c59b488b30fc1a8fdcbd3f452074a3662fd857c..0004c012ab1b42d2bdbbc2d9ce3b999fb542b599 100644 (file)
--- 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) 
 {