File plymouth-log-on-default.patch of Package plymouth

Overview Repositories Revisions Requests Users Attributes Meta

File plymouth-log-on-default.patch of Package plymouth (Revision af45c80c71f0e29360fb93bc6263f336)

Currently displaying revision af45c80c71f0e29360fb93bc6263f336 , Show latest

Index: plymouth-24.004.60/src/libply/ply-buffer.c
===================================================================
--- plymouth-24.004.60.orig/src/libply/ply-buffer.c
+++ plymouth-24.004.60/src/libply/ply-buffer.c
@@ -45,6 +45,10 @@
 #define PLY_BUFFER_MAX_BUFFER_CAPACITY (255 * 4096)
 #endif
 
+#ifndef PLY_BUFFER_MAX_LOG_BUFFER_CAPACITY
+#define PLY_BUFFER_MAX_LOG_BUFFER_CAPACITY (1024 * 4096)
+#endif
+
 struct _ply_buffer
 {
         char  *data;
@@ -66,6 +70,20 @@ ply_buffer_increase_capacity (ply_buffer
         return true;
 }
 
+static bool
+ply_buffer_increase_log_capacity (ply_buffer_t *buffer)
+{
+        assert (buffer != NULL);
+
+        if ((buffer->capacity * 2) > PLY_BUFFER_MAX_LOG_BUFFER_CAPACITY)
+                return false;
+
+        buffer->capacity *= 2;
+
+        buffer->data = realloc (buffer->data, buffer->capacity);
+        return true;
+}
+
 void
 ply_buffer_remove_bytes (ply_buffer_t *buffer,
                          size_t        bytes_to_remove)
@@ -205,6 +223,37 @@ ply_buffer_append_bytes (ply_buffer_t *b
         buffer->data[buffer->size] = '\0';
 }
 
+void ply_buffer_append_log_bytes (ply_buffer_t *buffer,
+                             const void   *bytes_in,
+                             size_t        length)
+{
+    assert (buffer != NULL);
+    assert (bytes_in != NULL);
+    assert (length != 0);
+
+    const uint8_t *bytes = bytes_in;
+
+    if (length > PLY_BUFFER_MAX_BUFFER_CAPACITY)
+    {
+        bytes += length - (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1);
+        length = (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1);
+    }
+
+    while ((buffer->size + length) >= buffer->capacity)
+    {
+        if (!ply_buffer_increase_log_capacity (buffer))
+            ply_buffer_remove_bytes (buffer, length);
+    }
+
+    assert (buffer->size + length < buffer->capacity);
+
+    memcpy (buffer->data + buffer->size,
+            bytes, length);
+
+    buffer->size += length;
+    buffer->data[buffer->size] = '\0';
+}
+
 void
 ply_buffer_append_from_fd (ply_buffer_t *buffer,
                            int           fd)
Index: plymouth-24.004.60/src/libply/ply-buffer.h
===================================================================
--- plymouth-24.004.60.orig/src/libply/ply-buffer.h
+++ plymouth-24.004.60/src/libply/ply-buffer.h
@@ -35,6 +35,10 @@ void ply_buffer_append_bytes (ply_buffer
                               const void   *bytes,
                               size_t        number_of_bytes);
 
+void ply_buffer_append_log_bytes (ply_buffer_t *buffer,
+                                  const void   *bytes,
+                                  size_t        length);
+
 void ply_buffer_append_from_fd (ply_buffer_t *buffer,
                                 int           fd);
 #define ply_buffer_append(buffer, format, args ...)                             \
Index: plymouth-24.004.60/src/main.c
===================================================================
--- plymouth-24.004.60.orig/src/main.c
+++ plymouth-24.004.60/src/main.c
@@ -1296,8 +1296,7 @@ deactivate_console (state_t *state)
         }
 
         /* do not let any tty opened where we could write after deactivate */
-        if (ply_kernel_command_line_has_argument ("plymouth.debug"))
-                ply_logger_close_file (ply_logger_get_error_default ());
+	ply_logger_close_file (ply_logger_get_error_default ());
 }
 
 static void
@@ -1946,6 +1945,7 @@ detach_from_running_session (state_t *st
         state->is_attached = false;
 }
 
+#if 0
 static void
 check_verbosity (state_t *state)
 {
@@ -2021,6 +2021,45 @@ check_verbosity (state_t *state)
                                        debug_buffer);
         }
 }
+#endif
+
+static void initialize_debug (state_t *state)
+{
+    if (!ply_is_tracing ())
+        ply_toggle_tracing ();
+
+    if (debug_buffer == NULL)
+        debug_buffer = ply_buffer_new ();
+
+    char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:");
+    if (stream != NULL)
+    {
+        int fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600);
+        if (fd < 0)
+            ply_trace ("could not stream output to %s: %m", stream);
+        else
+            ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
+        free (stream);
+    }
+
+    if (!debug_buffer_path)
+        debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:");
+
+    if (debug_buffer_path == NULL)
+    {
+        if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || state->mode == PLY_BOOT_SPLASH_MODE_REBOOT)
+            debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-shutdown-debug.log");
+        else
+            debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log");
+    }
+
+    if (debug_buffer != NULL)
+    {
+          ply_logger_add_filter (ply_logger_get_error_default (),
+                                 (ply_logger_filter_handler_t) on_error_message,
+                                 debug_buffer);
+    }
+}
 
 static void
 check_logging (state_t *state)
@@ -2107,8 +2146,10 @@ initialize_environment (state_t *state)
                         ply_trace ("going to go with '%s'", state->default_tty);
                 }
         }
-
+#if 0
         check_verbosity (state);
+#endif
+        initialize_debug (state);
         check_logging (state);
 
         ply_trace ("source built on %s", __DATE__);
@@ -2134,7 +2175,10 @@ on_error_message (ply_buffer_t *debug_bu
                   const void   *bytes,
                   size_t        number_of_bytes)
 {
+#if 0
         ply_buffer_append_bytes (debug_buffer, bytes, number_of_bytes);
+#endif
+        ply_buffer_append_log_bytes (debug_buffer, bytes, number_of_bytes);
 }
 
 static void
@@ -2328,7 +2372,7 @@ main (int    argc,
         bool should_help = false;
         bool no_boot_log = false;
         bool no_daemon = false;
-        bool debug = false;
+        bool debug = true;
         bool ignore_serial_consoles = false;
         bool graphical_boot = false;
         bool attach_to_session;

Places

File plymouth-log-on-default.patch of Package plymouth (Revision af45c80c71f0e29360fb93bc6263f336)

Places