commit 53b63c496e749613947326a8b44ebd61624450f9
author Tao Bao <tbao@google.com> Thu Sep 26 15:52:41 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Sep 26 15:52:41 2019 -0700
tree 1ac42f09ee10810ccafa03628274d36c49d166b5
parent df8d99af254f6d7de8bacd836d38ceedf77e7735
parent 05d6ba8acc53d173e279916e1f323c827a2d8925

Merge "Revert "AOSP: mke2fs: print error and exit if MKE2FS_CONFIG is invalid"" am: 47cba40d11 am: c5e2982552
am: 05d6ba8acc

Change-Id: Ic0a0bdc7d270c376fcfdf54970766284b002c192

misc/mke2fs.c

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index ce138fc..fcca0dc 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1596,7 +1596,7 @@
 		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;