]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
main: drop kernel_console_tty
authorRay Strode <rstrode@redhat.com>
Wed, 27 Nov 2013 05:24:54 +0000 (00:24 -0500)
committerRay Strode <rstrode@redhat.com>
Tue, 3 Dec 2013 15:51:32 +0000 (10:51 -0500)
We aren't actually really using it anymore.  It gets checked
in on place in the debugging code, but only before it's set.

This commit drops it.

src/main.c

index 17dd23a300c139599c1c6867e665d505772180e6..6e774ba2b45bc3af4aa9d01a44a959ea8654f8bd 100644 (file)
@@ -116,7 +116,6 @@ typedef struct
   uint32_t is_shown : 1;
   uint32_t should_force_details : 1;
 
-  char *kernel_console_tty;
   char *override_splash_path;
   char *system_default_splash_path;
   char *distribution_default_splash_path;
@@ -1902,10 +1901,7 @@ check_verbosity (state_t *state)
             const char* device;
             char *file;
 
-            if (state->kernel_console_tty != NULL)
-                device = state->kernel_console_tty;
-            else
-                device = state->default_tty;
+            device = state->default_tty;
 
             ply_trace ("redirecting debug output to %s", device);
 
@@ -2160,12 +2156,6 @@ check_for_consoles (state_t *state)
       ply_hashtable_insert (consoles, console, console);
     }
 
-  free (state->kernel_console_tty);
-  state->kernel_console_tty = NULL;
-
-  if (console != NULL)
-    state->kernel_console_tty = strdup (console);
-
   if (state->is_shown)
     {
       /* Do a full graphical splash if there's no weird serial console