efi_loader: console size of vidconsole

If stdout is 'vidconsole', we correctly set the console size.
If stdout is 'vidconsole,serial', the video console is ignored.

We should always evaluate the size of vidconsole if it is the primary
console.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c
index edcfce7becbc5ee25c0d0ecddba0a361ed3703c9..c4003554c20f39bf383db588a45badaa07521db7 100644 (file)
--- a/lib/efi_loader/efi_console.c
+++ b/lib/efi_loader/efi_console.c
@@ -311,7 +311,7 @@ static void query_console_size(void)
        const char *stdout_name = env_get("stdout");
        int rows = 25, cols = 80;
 
-       if (stdout_name && !strcmp(stdout_name, "vidconsole") &&
+       if (stdout_name && !strncmp(stdout_name, "vidconsole", 10) &&
            IS_ENABLED(CONFIG_DM_VIDEO)) {
                struct stdio_dev *stdout_dev =
                        stdio_get_by_name("vidconsole");