From 7219a3a770f6321da7413cbd60b1107c8c530086 Mon Sep 17 00:00:00 2001 From: Samuel Mendoza-Jonas Date: Fri, 10 Mar 2017 16:44:33 +1100 Subject: util/hooks: Don't update DT when ttyS* console active Update 30-dtb-updates to not accidentally treat ttyS* consoles as tty* and update linux,stdout-path with the VGA console details. Signed-off-by: Samuel Mendoza-Jonas --- utils/hooks/30-dtb-updates.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/hooks/30-dtb-updates.c b/utils/hooks/30-dtb-updates.c index 66e7a77..e161d87 100644 --- a/utils/hooks/30-dtb-updates.c +++ b/utils/hooks/30-dtb-updates.c @@ -515,7 +515,10 @@ static int set_stdout(struct offb_ctx *ctx) if (strncmp(boot_console, "/dev/", strlen("/dev/")) != 0) { /* We already have the full path */ stdout_path = talloc_strdup(ctx, boot_console); - } else if (strstr(boot_console, "tty") != NULL) { + /* Check for a tty* console but don't accidentally catch + * ttyS* consoles */ + } else if (strstr(boot_console, "tty") != NULL && + strstr(boot_console, "ttyS") == NULL) { fprintf(stderr, "TTY recognised: %s\n", boot_console); stdout_path = get_vga_path(ctx); } else { -- cgit v1.1