mirror of https://github.com/vitalif/e2fsprogs
Add E2FSCK_CONFIG environment variable
Also, use this environtment variable to make sure that a local /etc/e2fsck.conf file will not interfere with the regression test suite. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>bitmap-optimize
parent
d3c7c4eb98
commit
5dd2a6e08d
|
@ -563,6 +563,7 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
|
|||
struct sigaction sa;
|
||||
#endif
|
||||
char *extended_opts = 0;
|
||||
char *cp;
|
||||
|
||||
retval = e2fsck_allocate_context(&ctx);
|
||||
if (retval)
|
||||
|
@ -734,6 +735,8 @@ static errcode_t PRS(int argc, char *argv[], e2fsck_t *ret_ctx)
|
|||
if (extended_opts)
|
||||
parse_extended_opts(ctx, extended_opts);
|
||||
|
||||
if ((cp = getenv("E2FSCK_CONFIG")) != NULL)
|
||||
config_fn[0] = cp;
|
||||
profile_init(config_fn, &ctx->profile);
|
||||
|
||||
if (flush) {
|
||||
|
|
|
@ -25,3 +25,5 @@ export TZ
|
|||
LANG=C
|
||||
export LANG
|
||||
unset PAGER
|
||||
E2FSCK_CONFIG=/dev/null
|
||||
export E2FSCK_CONFIG
|
||||
|
|
Loading…
Reference in New Issue