commit 8b0fff524b1a33eefa051ff35c9bec844754939a
author Daniel Mentz <danielmentz@google.com> Mon Sep 23 15:11:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Sep 23 15:11:17 2019 -0700
tree fc28c61f9aaf382aec6d57d8ddc89481b599e072
parent 0608af3269104d1dfbcf2904d632f4d0a092d8cd
parent 0c88147ef196017d6995040fbfd84c00ab686233

Merge "AOSP: mke2fs: print error and exit if MKE2FS_CONFIG is invalid" am: 6521f01411 am: 3ff8d286bd
am: 0c88147ef1

Change-Id: Ia4faa7205093ce9067874cbfac5819310f9272ad

misc/mke2fs.c

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index f05003f..8d84f9d 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -1552,7 +1552,7 @@
 		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;