Merge remote-tracking branch 'origin/seventeen' into seventeen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Nov 2014 16:36:01 +0000 (17:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 10 Nov 2014 16:36:01 +0000 (17:36 +0100)
src/installer/main.c

index 01a9cc6..6e151fb 100644 (file)
@@ -289,7 +289,7 @@ static void parse_command_line(struct config* c) {
                        char* key = strsep(&val, "=");
 
                        // serial console
-                       if (strcmp(token, "console=ttyS0") == 0)
+                       if ((strcmp(key, "console") == 0) && (strncmp(val, "ttyS", 4) == 0))
                                c->serial_console = 1;
 
                        // enable networking?