openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 950313ebf7 ("tools: bootconfig: Add bootconfig command")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2020-06-16 19:14:25 +09:00 committed by Steven Rostedt (VMware)
parent 272da3279d
commit f91cb5b747
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/bootconfig/main.c
View File

@ -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);