X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=utils%2Fhooks%2F30-dtb-updates.c;h=e161d8794c1ad96d696ea99802274fb12107958a;hp=66e7a77b63bddb21ed800448f88c6d267e1b294a;hb=6704a228c6389607f775bbaf2ee7de786d7b9996;hpb=8107b37ad034f7fd201ed49dfcc7a8284e71de0a

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 {