diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 14:41:29 -0500 |
| commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
| tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch | |
| parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
| parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
| download | talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.gz talos-openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.zip | |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch')
| -rw-r--r-- | yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch new file mode 100644 index 000000000..cba0ce004 --- /dev/null +++ b/yocto-poky/meta/recipes-devtools/e2fsprogs/e2fsprogs/misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch @@ -0,0 +1,37 @@ +From e4ffd6fe975888d306b5f700ba54af18b59f6759 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Thu, 20 Mar 2014 11:10:21 +0800 +Subject: [PATCH] misc/mke2fs.c: return error when failed to populate filesystem + +We need return retval when "mke2fs -d" failed, otherwise the "$?" would +be 0 which is misleading. + +Upstream-Status: Submitted + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + misc/mke2fs.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/misc/mke2fs.c b/misc/mke2fs.c +index a63f0b7..846190e 100644 +--- a/misc/mke2fs.c ++++ b/misc/mke2fs.c +@@ -2745,10 +2745,11 @@ no_journal: + current_fs = fs; + root = EXT2_ROOT_INO; + retval = populate_fs(root, root_dir); +- if (retval) ++ if (retval) { + fprintf(stderr, "%s", +- _("\nError while populating file system")); +- else if (!quiet) ++ _("\nError while populating file system\n")); ++ return retval; ++ } else if (!quiet) + printf("%s", _("done\n")); + } + +-- +1.8.3.1 + |
