[PATCH] Collate "run init" message to one line with prefixed var assignments

From: Rob Landley
Date: Wed Nov 11 2020 - 10:36:48 EST


From: Rob Landley <rob@xxxxxxxxxxx>

Run init: HOME=/ TERM=linux /init

Signed-off-by: Rob Landley <rob@xxxxxxxxxxx>
---

init/main.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/init/main.c b/init/main.c
index 130376ec10ba..80b06566852b 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1328,15 +1328,16 @@ static void __init do_pre_smp_initcalls(void)
static int run_init_process(const char *init_filename)
{
const char *const *p;
+ char buf[512], *s = buf;

argv_init[0] = init_filename;
- pr_info("Run %s as init process\n", init_filename);
- pr_debug(" with arguments:\n");
- for (p = argv_init; *p; p++)
- pr_debug(" %s\n", *p);
- pr_debug(" with environment:\n");
- for (p = envp_init; *p; p++)
- pr_debug(" %s\n", *p);
+
+ for (p = (void *)envp_init; *p; p++)
+ s += sprintf(s, "%.*s ", (int)(sizeof(buf)-(s-buf)), *p);
+ for (p = (void *)argv_init; *p; p++)
+ s += sprintf(s, "%.*s ", (int)(sizeof(buf)-(s-buf)), *p);
+ pr_info("Run init: %s\n", buf);
+
return kernel_execve(init_filename, argv_init, envp_init);
}