Re: [PATCH 1/8] bootconfig: Set CONFIG_BOOT_CONFIG=n by default

[Geert Uytterhoeven]

Hi Hiramatsu-san,

On Thu, Feb 20, 2020 at 8:26 AM Masami Hiramatsu <mhiramat@xxxxxxxxxx> wrote:
> Set CONFIG_BOOT_CONFIG=n by default. This also warns
> user if CONFIG_BOOT_CONFIG=n but "bootconfig" is given
> in the kernel command line.
>
> Suggested-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
> Signed-off-by: Masami Hiramatsu <mhiramat@xxxxxxxxxx>

Thanks for your patch!

> --- a/init/Kconfig
> +++ b/init/Kconfig
> @@ -1218,7 +1218,7 @@ endif
>  config BOOT_CONFIG
>         bool "Boot config support"
>         depends on BLK_DEV_INITRD
> -       default y
> +       default n

"default n" is the default, so you can just drop the line.

>         help
>           Extra boot config allows system admin to pass a config file as
>           complemental extension of kernel cmdline when booting.
> diff --git a/init/main.c b/init/main.c
> index 59248717c925..680ff7123705 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -418,6 +418,14 @@ static void __init setup_boot_config(const char *cmdline)
>  }
>  #else
>  #define setup_boot_config(cmdline)     do { } while (0)
> +
> +static int __init warn_bootconfig(char *str)
> +{
> +       pr_err("WARNING: 'bootconfig' found on the kernel command line but CONFIG_BOOTCONFIG is not set.\n");

pr_warn()?

> +       return 0;
> +}
> +early_param("bootconfig", warn_bootconfig);
> +
>  #endif

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds