diff options
| author | Tao Bao <tbao@google.com> | 2019-09-26 15:39:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-26 15:39:09 -0700 |
| commit | c5e29825525c38b78eaf9b94f52ad2c46b935b43 (patch) | |
| tree | 1ac42f09ee10810ccafa03628274d36c49d166b5 | |
| parent | 31a33c135a6d3f0a6aa3ef62aecb061c9effc285 (diff) | |
| parent | 47cba40d11aa6ae054df057ea84bf3169ad99ab7 (diff) | |
| download | e2fsprogs-c5e29825525c38b78eaf9b94f52ad2c46b935b43.tar.gz | |
Merge "Revert "AOSP: mke2fs: print error and exit if MKE2FS_CONFIG is invalid""
am: 47cba40d11
Change-Id: I16661453d98180be2f2654253fe6a9337d624415
| -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 ce138fc1..fcca0dce 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1596,7 +1596,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 && config_fn[0] != tmp) { + if (retval == ENOENT) { retval = profile_init(default_files, &profile); if (retval) goto profile_error; |