Merge branch 'device-manager-fbdev-add-after-timeout' into 'main'

ply-device-manager: Accept new simpledrm/fbdev devices from udev events after timeout

Closes #167

See merge request plymouth/plymouth!165

1 files changed, 8 insertions, 5 deletions

diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c
index 82b89f35..215f5bef 100644
--- a/src/libply-splash-core/ply-device-manager.c
+++ b/src/libply-splash-core/ply-device-manager.c
@@ -450,14 +450,17 @@ verify_add_or_change (ply_device_manager_t *manager,
         if (strcmp (action, "add") && strcmp (action, "change"))
                 return false;
 
+        if (manager->local_console_managed && manager->local_console_is_text) {
+                ply_trace ("ignoring since we're already using text splash for local console");
+                return false;
+        }
+
+        if (manager->device_timeout_elapsed)
+                return true;
+
         subsystem = udev_device_get_subsystem (device);
 
         if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
-                if (manager->local_console_managed && manager->local_console_is_text) {
-                        ply_trace ("ignoring since we're already using text splash for local console");
-                        return false;
-                }
-
                 if (!verify_drm_device (device)) {
                         ply_trace ("ignoring since we only handle SimpleDRM devices after timeout");
                         return false;