From: Charlie Brej <cbrej@cs.man.ac.uk>
Date: Thu, 27 Aug 2009 15:57:12 +0000 (+0100)
Subject: [main] Allow debug output file to be set on the command line
X-Git-Tag: 0.7.2~24^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bafe3437ea480f3609f2e8ae153d713b97ddd291;p=thirdparty%2Fplymouth.git

[main] Allow debug output file to be set on the command line
---

diff --git a/src/main.c b/src/main.c
index c98bdf7e..ba4ade3d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -123,7 +123,7 @@ static void on_error_message (ply_buffer_t *debug_buffer,
                               const void   *bytes,
                               size_t        number_of_bytes);
 static ply_buffer_t *debug_buffer;
-static char *debug_buffer_path;
+static char *debug_buffer_path = NULL;
 
 static void
 switch_to_vt (int vt_number)
@@ -1130,7 +1130,7 @@ check_verbosity (state_t *state)
       if (!ply_is_tracing ())
         ply_toggle_tracing ();
 
-      if (path != NULL)
+      if (path != NULL && debug_buffer_path == NULL)
         {
           char *end;
 
@@ -1383,6 +1383,7 @@ main (int    argc,
                                   "attach-to-session", "Redirect console messages from screen to log", PLY_COMMAND_OPTION_TYPE_FLAG,
                                   "no-daemon", "Do not daemonize", PLY_COMMAND_OPTION_TYPE_FLAG,
                                   "debug", "Output debugging information", PLY_COMMAND_OPTION_TYPE_FLAG,
+                                  "debug-file", "File to output debugging information to", PLY_COMMAND_OPTION_TYPE_STRING,
                                   "mode", "Mode is one of: boot, shutdown", PLY_COMMAND_OPTION_TYPE_STRING,
                                   NULL);
 
@@ -1404,6 +1405,7 @@ main (int    argc,
                                   "mode", &mode_string,
                                   "no-daemon", &no_daemon,
                                   "debug", &debug,
+                                  "debug-file", &debug_buffer_path,
                                   NULL);
 
   if (should_help)