From: Ray Strode <rstrode@redhat.com>
Date: Sat, 20 Nov 2010 00:33:34 +0000 (-0500)
Subject: main: Always translate tty0 to tty1
X-Git-Tag: 0.8.4~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd0b8662227e09f9032d4d40f74307853809d7b5;p=thirdparty%2Fplymouth.git

main: Always translate tty0 to tty1

Another bug in check_for_consoles...

We can't ever write to tty0 directly, because
it is redirected (just like /dev/console).  Previously
we would translate the call to tty1, but commit

c40fd792b6edf931a6bbe2ec23518b57483a4e2f

broke that.  This commit fixes it again.
---

diff --git a/src/main.c b/src/main.c
index b6ee8780..1f55ff9b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1784,6 +1784,12 @@ check_for_consoles (state_t    *state,
       if (end != NULL)
         *end = '\0';
 
+      if (strcmp (console, "tty0") == 0 || strcmp (console, "/dev/tty0") == 0)
+        {
+          free (console);
+          console = strdup (default_tty);
+        }
+
       ply_trace ("serial console %s found!", console);
       ply_hashtable_insert (consoles, console, NULL);
 
@@ -1794,12 +1800,7 @@ check_for_consoles (state_t    *state,
   state->kernel_console_tty = NULL;
 
   if (console != NULL)
-    {
-      if (strcmp (console, "tty0") == 0 || strcmp (console, "/dev/tty0") == 0)
-          state->kernel_console_tty = strdup (default_tty);
-      else
-          state->kernel_console_tty = strdup (console);
-    }
+    state->kernel_console_tty = strdup (console);
 
   if (should_add_displays)
     {