Attachment 1448545 Details for Bug 1518464 – proposed patch for plymouth

[patch] proposed patch for plymouth

0001-Skip-graphical-renderer-setup-when-doing-detailed-sp.patch (text/plain), 4.04 KB, created by Adam Williamson on 2018-06-07 01:36:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Williamson

Created: 2018-06-07 01:36:20 UTC

Size: 4.04 KB

patch

obsolete

>From 26f8d87563e3d281f8ec29f0932457e0af5a52b0 Mon Sep 17 00:00:00 2001
>From: Adam Williamson <awilliam@redhat.com>
>Date: Wed, 6 Jun 2018 17:06:14 -0700
>Subject: [PATCH] Skip graphical renderer setup when doing detailed splash
>
>Currently, if 'rhgb' or 'splash' is not on the cmdline, we set
>PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV. The idea is to not bother
>dealing with udev and waiting for graphics devices to show up
>if we're showing a detailed text boot anyway. However, we *do*
>still try and set up any graphical renderers that are present,
>we just don't do it via udev - we hit create_fallback_devices
>in ply-device-manager, which basically just tries to load all
>available graphical renderers with default device locations.
>
>It's worth noting that before e4f86e3c, this failed, at least in
>the systems I've tested - renderer load failed in
>ply_renderer_open_plugin. It has only actually been succeeding
>in setting up renderers since that commit landed.
>
>This commit adds a new flag that tells the device manager to
>not bother with the fallback device setup either and just go
>straight to text rendering, and sets it on this path (when
>we're defaulting to detailed boot not pretty boot). The major
>benefit of this for me is it should be a way to fix #1518464,
>but it seems also to be conceptually correct and in line with
>the initial intent of skipping udev on this path.
>
>Signed-off-by: Adam Williamson <awilliam@redhat.com>
>---
> src/libply-splash-core/ply-device-manager.c | 9 +++++++++
> src/libply-splash-core/ply-device-manager.h | 3 ++-
> src/main.c                                  | 3 ++-
> 3 files changed, 13 insertions(+), 2 deletions(-)
>
>diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
>index fbf4723..068b7b3 100644
>--- a/src/libply-splash-core/ply-device-manager.c
>+++ b/src/libply-splash-core/ply-device-manager.c
>@@ -845,6 +845,15 @@ ply_device_manager_watch_devices (ply_device_manager_t                *manager,
>         if (done_with_initial_devices_setup)
>                 return;
> 
>+        if ((manager->flags & PLY_DEVICE_MANAGER_RENDERER_NONE)) {
>+                ply_trace ("Detailed boot requested, creating non-graphical devices");
>+                create_devices_for_terminal_and_renderer_type (manager,
>+                                                               NULL,
>+                                                               manager->local_console_terminal,
>+                                                               PLY_RENDERER_TYPE_NONE);
>+                return;
>+        }
>+
>         if ((manager->flags & PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV)) {
>                 ply_trace ("udev support disabled, creating fallback devices");
>                 create_fallback_devices (manager);
>diff --git a/src/libply-splash-core/ply-device-manager.h b/src/libply-splash-core/ply-device-manager.h
>index 058f6e8..1336d56 100644
>--- a/src/libply-splash-core/ply-device-manager.h
>+++ b/src/libply-splash-core/ply-device-manager.h
>@@ -31,7 +31,8 @@ typedef enum
> {
>         PLY_DEVICE_MANAGER_FLAGS_NONE = 0,
>         PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES = 1 << 0,
>-                PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV = 1 << 1
>+                PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV = 1 << 1,
>+                PLY_DEVICE_MANAGER_RENDERER_NONE = 1 << 2
> } ply_device_manager_flags_t;
> 
> typedef struct _ply_device_manager ply_device_manager_t;
>diff --git a/src/main.c b/src/main.c
>index f1e0fa7..c02053e 100644
>--- a/src/main.c
>+++ b/src/main.c
>@@ -2358,7 +2358,8 @@ main (int    argc,
>                 device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
> 
>         if (!plymouth_should_show_default_splash (&state)) {
>-                /* don't bother listening for udev events if we're forcing details */
>+                /* don't bother setting up graphical renderer if we're forcing details */
>+                device_manager_flags |= PLY_DEVICE_MANAGER_RENDERER_NONE;
>                 device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
> 
>                 /* don't ever delay showing the detailed splash */
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1518464: 1446774 | 1446787 | 1448545