Attachment 140445 Details for Bug 107048 – [PATCH 1/2] main: Fix getting detailed logs from systemd (v2)

[patch] [PATCH 1/2] main: Fix getting detailed logs from systemd (v2)

0001-main-Fix-getting-detailed-logs-from-systemd.patch (text/plain), 3.28 KB, created by Hans de Goede on 2018-07-03 07:26:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hans de Goede

Created: 2018-07-03 07:26:49 UTC

Size: 3.28 KB

patch

obsolete

>From 9ddfa18f4965505a3d5ccb9ed3d2fee8ba1d6ab8 Mon Sep 17 00:00:00 2001
>From: Hans de Goede <hdegoede@redhat.com>
>Date: Tue, 26 Jun 2018 09:15:25 +0200
>Subject: [PATCH 1/2] main: Fix getting detailed logs from systemd
>
>This are 3 issues with the detailed logs handling:
>
>1) plymouth attaches to the session directly on a show-splash command
>(in on_show_splash()), but it does not tell systemd to start printing
>details until the splash is actually shown after the splash_delay.
>
>2) If the splash is actually shown during the initrd (e.g. a diskcript
>password is necessary) then we tell the initrd systemd instance to
>print details, but we don't tell the regular initrd instance which takes
>over as pid 1 after the switch-root to print details.
>
>This leads to rather inconsistent logging/printing behavior, e.g.:
>
>* If a diskcrypt password is asked for, we only log details from
>the initrd phase.
>
>* If the boot is shorter then splash_delay no details are logged
>
>* If the user presses ESC during boot during the initrd, only initrd
>  messages are printed
>
>* If the user presses ESC during boot after the initrd, only normal
>  messages are printed
>
>This commit fixes both these issues by:
>
>1) Telling systemd to print details as soon as we have attached to the session;
>   and to stop printing details when we detach from the session (*)
>2) Telling systemd to print details after the rootfs has been remounted rw
>
>*) This is necessary to have a smooth transition to e.g. gdm if the splash
>has not shown because the boot is shorter then splash_delay
>
>Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>---
>Changes in v2:
>-Tell systemd to stop printing details when we detach from the session, so
> that we don't break the smooth transition from no-splash-shown-yet to gdm
>---
> src/main.c | 18 +++++++++++++-----
> 1 file changed, 13 insertions(+), 5 deletions(-)
>
>diff --git a/src/main.c b/src/main.c
>index 7317c68..d3d6575 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -851,6 +851,11 @@ on_system_initialized (state_t *state)
>         ply_trace ("system now initialized, opening log");
>         state->system_initialized = true;
> 
>+#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
>+        if (state->is_attached)
>+                tell_systemd_to_print_details (state);
>+#endif
>+
>         prepare_logging (state);
> }
> 
>@@ -1781,11 +1786,6 @@ show_theme (state_t    *state,
>                 return NULL;
>         }
> 
>-#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
>-        if (state->is_attached)
>-                tell_systemd_to_print_details (state);
>-#endif
>-
>         ply_device_manager_activate_keyboards (state->device_manager);
> 
>         return splash;
>@@ -1832,6 +1832,10 @@ attach_to_running_session (state_t *state)
>                 return false;
>         }
> 
>+#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
>+        tell_systemd_to_print_details (state);
>+#endif
>+
>         state->is_redirected = should_be_redirected;
>         state->is_attached = true;
>         state->session = session;
>@@ -1848,6 +1852,10 @@ detach_from_running_session (state_t *state)
>         if (!state->is_attached)
>                 return;
> 
>+#ifdef PLY_ENABLE_SYSTEMD_INTEGRATION
>+        tell_systemd_to_stop_printing_details (state);
>+#endif
>+
>         ply_trace ("detaching from terminal session");
>         ply_terminal_session_detach (state->session);
>         state->is_redirected = false;
>-- 
>2.17.1
>

Actions: View | Splinter Review

Attachments on bug 107048: 140351 | 140352 | 140445

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.