diff options
author | Masami Hiramatsu <mhiramat@kernel.org> | 2024-04-09 07:43:58 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-17 12:23:36 +0300 |
commit | 786afd51e21481ee4430fe35f61c6b49bfb2cd50 (patch) | |
tree | a7804fe6d88b3b4f7493d83d528d843d6f57c9a8 /init/main.c | |
parent | 0f33fd80e8ff12b59a3465052fcf81a40f83ef2d (diff) | |
download | linux-786afd51e21481ee4430fe35f61c6b49bfb2cd50.tar.xz |
fs/proc: Skip bootloader comment if no embedded kernel parameters
commit c722cea208789d9e2660992bcd05fb9fac3adb56 upstream.
If the "bootconfig" kernel command-line argument was specified or if
the kernel was built with CONFIG_BOOT_CONFIG_FORCE, but if there are
no embedded kernel parameter, omit the "# Parameters from bootloader:"
comment from the /proc/bootconfig file. This will cause automation
to fall back to the /proc/cmdline file, which will be identical to the
comment in this no-embedded-kernel-parameters case.
Link: https://lore.kernel.org/all/20240409044358.1156477-2-paulmck@kernel.org/
Fixes: 8b8ce6c75430 ("fs/proc: remove redundant comments from /proc/bootconfig")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Cc: stable@vger.kernel.org
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 9e6ab6d593bd..98fdd93d79a5 100644 --- a/init/main.c +++ b/init/main.c @@ -485,6 +485,11 @@ static int __init warn_bootconfig(char *str) early_param("bootconfig", warn_bootconfig); +bool __init cmdline_has_extra_options(void) +{ + return extra_command_line || extra_init_args; +} + /* Change NUL term back to "=", to make "param" the whole string. */ static void __init repair_env_string(char *param, char *val) { |