Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
From:   Rob Landley <rob@landley.net>
Subject: [PATCH] Collate "run init" message to one line with prefixed var
 assignments
Message-ID: <6daf4796-b211-8022-984c-0dcc20dede0f@landley.net>
Date:   Wed, 11 Nov 2020 09:47:14 -0600
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

From: Rob Landley <rob@landley.net>

Run init: HOME=/ TERM=linux /init

Signed-off-by: Rob Landley <rob@landley.net>
---

 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);
 }