From 33347866de54a9fcc974455564c0b38b6227af7b Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 25 Oct 2022 10:29:51 +0100 Subject: [PATCH] Revert "trivial: load hwinfo early so plugins can use the info timely" This reverts commit 960b6141a6c9586f4aafd820060803d74377c20c as fu_context_load_hwinfo() needs to load the HWID quirks, and we need to load the plugins before the quirks otherwise we'll get warnings about quirk keys not being registered. --- src/fu-engine.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fu-engine.c b/src/fu-engine.c index 822046ae7..48adfd4a0 100644 --- a/src/fu-engine.c +++ b/src/fu-engine.c @@ -7622,9 +7622,9 @@ fu_engine_load(FuEngine *self, FuEngineLoadFlags flags, FuProgress *progress, GE fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "read-remotes"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "ensure-client-cert"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "write-db"); - fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "load-hwinfo"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "load-plugins"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "load-quirks"); + fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "load-hwinfo"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "load-appstream"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "backend-setup"); fu_progress_add_step(progress, FWUPD_STATUS_LOADING, 1, "plugins-init"); @@ -7734,11 +7734,6 @@ fu_engine_load(FuEngine *self, FuEngineLoadFlags flags, FuProgress *progress, GE } fu_progress_step_done(progress); - /* load SMBIOS and the hwids */ - if (flags & FU_ENGINE_LOAD_FLAG_HWINFO) - fu_context_load_hwinfo(self->ctx, NULL); - fu_progress_step_done(progress); - /* load plugins early, as we have to call ->load() *before* building quirk silo */ if (!fu_engine_load_plugins(self, flags, fu_progress_get_child(progress), error)) { g_prefix_error(error, "failed to load plugins: "); @@ -7770,6 +7765,11 @@ fu_engine_load(FuEngine *self, FuEngineLoadFlags flags, FuProgress *progress, GE g_warning("Failed to load quirks: %s", error_quirks->message); fu_progress_step_done(progress); + /* load SMBIOS and the hwids */ + if (flags & FU_ENGINE_LOAD_FLAG_HWINFO) + fu_context_load_hwinfo(self->ctx, NULL); + fu_progress_step_done(progress); + /* load AppStream metadata */ if (!fu_engine_load_metadata_store(self, flags, error)) { g_prefix_error(error, "Failed to load AppStream data: ");