summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/hooks/30-dtb-updates.c5
1 files changed, 4 insertions, 1 deletions
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 {
OpenPOWER on IntegriCloud