proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-14 12:35:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "trivial: load hwinfo early so plugins can use the info timely"

Browse Source 
This reverts commit 960b6141a6 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.
This commit is contained in:
Richard Hughes 2022-10-25 10:29:51 +01:00 committed by Mario Limonciello
parent e8eaca0051
commit 33347866de
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fu-engine.c
View File

@ -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: ");