diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2020-06-16 19:14:25 +0900 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2020-06-16 21:21:03 -0400 |
| commit | f91cb5b7476a603068eae31e5b2cc170dd2b9b1b (patch) | |
| tree | 11bc2631873b0e14d4300f7cfd328e64dcc870c8 /tools | |
| parent | 272da3279df191f028fd63d1683e5ecd56fcb13b (diff) | |
| download | linux-f91cb5b7476a603068eae31e5b2cc170dd2b9b1b.tar.gz linux-f91cb5b7476a603068eae31e5b2cc170dd2b9b1b.tar.bz2 linux-f91cb5b7476a603068eae31e5b2cc170dd2b9b1b.zip | |
tools/bootconfig: Fix to return 0 if succeeded to show the bootconfig
Fix bootconfig to return 0 if succeeded to show the bootconfig
in initrd. Without this fix, "bootconfig INITRD" command
returns !0 even if the command succeeded to show the bootconfig.
Link: http://lkml.kernel.org/r/159230246566.65555.11891772258543514487.stgit@devnote2
Cc: stable@vger.kernel.org
Fixes: 950313ebf79c ("tools: bootconfig: Add bootconfig command")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootconfig/main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/bootconfig/main.c b/tools/bootconfig/main.c index 21896a6675fd..e0878f5f74b1 100644 --- a/tools/bootconfig/main.c +++ b/tools/bootconfig/main.c @@ -207,11 +207,13 @@ int show_xbc(const char *path) } ret = load_xbc_from_initrd(fd, &buf); - if (ret < 0) + if (ret < 0) { pr_err("Failed to load a boot config from initrd: %d\n", ret); - else - xbc_show_compact_tree(); - + goto out; + } + xbc_show_compact_tree(); + ret = 0; +out: close(fd); free(buf); |