From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 14 Apr 2014 15:43:24 +0000 (-0400)
Subject: mke2fs.c: return error when failed to populate fs
X-Git-Tag: v1.43-WIP-2015-05-18~299
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2af02215375802d67d8e28341cf408cd1e4ed4e6;p=tools%2Fe2fsprogs.git

mke2fs.c: return error when failed to populate fs

We need return retval when "mke2fs -d" failed, otherwise the "$?"
would be 0 which is misleading.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Reviewed-by: Zheng Liu <wenqing.lz@taobao.com>
---

diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index aecd5d5..60e7466 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -2990,10 +2990,11 @@ no_journal:
 
 		retval = populate_fs(fs, EXT2_ROOT_INO, root_dir,
 				     EXT2_ROOT_INO);
-		if (retval)
-			fprintf(stderr, "%s",
-				_("\nError while populating file system"));
-		else if (!quiet)
+		if (retval) {
+			com_err(program_name, retval, "%s",
+				_("\nError while populating file system\n"));
+			exit(1);
+		} else if (!quiet)
 			printf("%s", _("done\n"));
 	}