Detect serial console and redirect messages if present

Previously, we were hard coding tty1.  Now we send messages
to whatever is specified as the console, if a console is
specified.

diff --git a/src/main.c b/src/main.c
index 01267fc5d6338fa53ea7aaab89aea53ed875451e..e6121e3e9363139f5407c700fb66de4680c13909 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -60,6 +60,8 @@ typedef struct
   uint32_t showing_details : 1;
   uint32_t system_initialized : 1;
 
+  char *console;
+
   int number_of_errors;
 } state_t;
 
@@ -467,12 +469,43 @@ check_verbosity (state_t *state)
     ply_trace ("tracing shouldn't be enabled!");
 }
 
+static void
+check_for_serial_console (state_t *state)
+{
+  char *console_key;
+
+  ply_trace ("checking if splash screen should be disabled");
+
+  console_key = strstr (state->kernel_command_line, " console=");
+  if (console_key != NULL)
+    {
+      char *end;
+      ply_trace ("serial console found!");
+      state->console = strdup (console_key + strlen (" console="));
+
+      end = strpbrk (state->console, " \n\t\v");
+
+      if (end != NULL)
+        *end = '\0';
+    }
+}
+
 static bool
-set_console_io_to_vt1 (state_t *state)
+redirect_standard_io_to_device (char *device)
 {
   int fd;
+  char *file;
+
+  ply_trace ("redirecting stdio to %s", device);
+
+  if (strncmp (device, "/dev/", strlen ("/dev/")) == 0)
+    file = strdup (device);
+  else
+    asprintf (&file, "/dev/%s", device);
+
+  fd = open (file, O_RDWR | O_APPEND);
 
-  fd = open ("/dev/tty1", O_RDWR | O_APPEND);
+  free (file);
 
   if (fd < 0)
     return false;
@@ -493,9 +526,12 @@ initialize_environment (state_t *state)
     return false;
 
   check_verbosity (state);
+  check_for_serial_console (state);
 
-  if (!set_console_io_to_vt1 (state))
-    return false;
+  if (state->console != NULL)
+    redirect_standard_io_to_device (state->console);
+  else
+    redirect_standard_io_to_device ("tty1");
 
   ply_trace ("initialized minimal work environment");
   return true;