Commit f91cb5b7 authored Jun 16, 2020 by Masami Hiramatsu Committed by Steven Rostedt (VMware) Jun 16, 2020

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: 950313eb ("tools: bootconfig: Add bootconfig command")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

parent 272da327

tools/bootconfig/main.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -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
		goto out;
		}
		xbc_show_compact_tree();

		ret = 0;
		out:
		close(fd);
		free(buf);

Admin message