From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Tue, 12 Mar 2024 04:14:24 +0000 (+0900)
Subject: inittab: fallback when multiple "console=" is detected
X-Git-Url: http://git.openwrt.org/?p=project%2Fprocd.git;a=commitdiff_plain;h=ca8c30208d5e1aaa2c0e3f732c4c9944735e9850

inittab: fallback when multiple "console=" is detected

Linux Kernel uses a console in the last "console=" parameter in bootargs
as /dev/console, so falllback to /dev/console or get_active_console()
when multiple "console=" parameter is found in bootargs, instead of
using the first console.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
---

diff --git a/inittab.c b/inittab.c
index 128268a..73a2174 100644
--- a/inittab.c
+++ b/inittab.c
@@ -192,7 +192,8 @@ static void askconsole(struct init_action *a)
 	 * is in the device tree
 	 */
 	tty = get_cmdline_val("console", line, sizeof(line));
-	if (tty == NULL) {
+	if (tty == NULL ||
+	    get_cmdline_val_offset("console", line, sizeof(line), 1)) {
 		if (dev_exist("console"))
 			tty = "console";
 		else