Commit caa0708a authored by Masami Hiramatsu (Google)'s avatar Masami Hiramatsu (Google)
Browse files

bootconfig: Change message if no bootconfig with CONFIG_BOOT_CONFIG_FORCE=y 

Change no bootconfig data error message if user do not specify 'bootconfig'
option but CONFIG_BOOT_CONFIG_FORCE=y.
With CONFIG_BOOT_CONFIG_FORCE=y, the kernel proceeds bootconfig check even
if user does not specify 'bootconfig' option. So the current error message
is confusing. Let's show just an information message to notice skipping
the bootconfig in that case.

Link: https://lore.kernel.org/all/167754610254.318944.16848412476667893329.stgit@devnote2/



Fixes: b743852c ("Allow forcing unconditional bootconfig processing")
Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/all/CAMuHMdV9jJvE2y8gY5V_CxidUikCf5515QMZHzTA3rRGEOj6=w@mail.gmail.com/


Suggested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Tested-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Acked-by: default avatarMukesh Ojha <quic_mojha@quicinc.com>
parent b6924512

init/main.c

+7 −3
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static char *extra_init_args; 


#ifdef CONFIG_BOOT_CONFIG

/* Is bootconfig on command line? */

static bool bootconfig_found = IS_ENABLED(CONFIG_BOOT_CONFIG_FORCE);

static bool bootconfig_found;

static size_t initargs_offs;

#else

# define bootconfig_found false
@@ -429,7 +429,7 @@ static void __init setup_boot_config(void) 
	err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,

			 bootconfig_params);



	if (IS_ERR(err) || !bootconfig_found)

	if (IS_ERR(err) || !(bootconfig_found || IS_ENABLED(CONFIG_BOOT_CONFIG_FORCE)))

		return;



	/* parse_args() stops at the next param of '--' and returns an address */
@@ -437,7 +437,11 @@ static void __init setup_boot_config(void) 
		initargs_offs = err - tmp_cmdline;



	if (!data) {

		/* If user intended to use bootconfig, show an error level message */

		if (bootconfig_found)

			pr_err("'bootconfig' found on command line, but no bootconfig found\n");

		else

			pr_info("No bootconfig data provided, so skipping bootconfig");

		return;

	}