diff options
| author | Daniel Mentz <danielmentz@google.com> | 2019-09-23 14:56:04 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-23 14:56:04 -0700 |
| commit | 3ff8d286bdc91d08610d6cb2d17dcfcb1d1dee1c (patch) | |
| tree | fc28c61f9aaf382aec6d57d8ddc89481b599e072 | |
| parent | 0608af3269104d1dfbcf2904d632f4d0a092d8cd (diff) | |
| parent | 6521f01411b2e19769daf6449d234f96f7648d21 (diff) | |
| download | e2fsprogs-3ff8d286bdc91d08610d6cb2d17dcfcb1d1dee1c.tar.gz | |
Merge "AOSP: mke2fs: print error and exit if MKE2FS_CONFIG is invalid"
am: 6521f01411
Change-Id: I43cc0ef7e8ca70bd92e84d91913316c2aa25fb7d
| -rw-r--r-- | misc/mke2fs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/misc/mke2fs.c b/misc/mke2fs.c index f05003fc..8d84f9dc 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1552,7 +1552,7 @@ static void PRS(int argc, char *argv[]) config_fn[0] = tmp; profile_set_syntax_err_cb(syntax_err_report); retval = profile_init(config_fn, &profile); - if (retval == ENOENT) { + if (retval == ENOENT && config_fn[0] != tmp) { retval = profile_init(default_files, &profile); if (retval) goto profile_error; |