From 905c2678a3a2ba6afee12ab31446db3054ccc741 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 8 Mar 2021 09:27:08 +0100 Subject: [PATCH] Fix path to fallback console and handle leading /dev from cmdline Signed-off-by: Joachim Wiberg --- src/helpers.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/helpers.c b/src/helpers.c index 34868798..8540825c 100644 --- a/src/helpers.c +++ b/src/helpers.c @@ -103,6 +103,9 @@ static void add_console(char *cons) if (ptr) *ptr = 0; + if (!strncmp(cons, "/dev/", 5)) + cons += 5; + snprintf(path, sizeof(path), "/dev/%s", cons); /* check for and skip duplicates */ @@ -131,7 +134,7 @@ static void find_active_consoles(void) if (!fp) { fallback: _d("Using fallback /dev/console"); - add_console("/dev/console"); + add_console("console"); return; }