From dff281311c2041ae8dc8c6a393338f246737ef9c Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Fri, 18 May 2018 11:01:08 -0500 Subject: [PATCH] uefi: Set the alternate GUID for parenting later Several places in the UEFI plugin operate on the default GUID rather than iterating a list of GUIDs. This is normally fine since UEFI GUIDs are tied to the ESRT and normally one FuDevice shouldn't have multiple GUIDs. The alternate GUID was added to set parents accordingly but this caused no CAB files to be able to install. Fixes: cc664d7d (amt: Put the AMT device as a child under the system UEFI firmware) --- plugins/uefi/fu-plugin-uefi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/uefi/fu-plugin-uefi.c b/plugins/uefi/fu-plugin-uefi.c index 098978a01..bcc3bc916 100644 --- a/plugins/uefi/fu-plugin-uefi.c +++ b/plugins/uefi/fu-plugin-uefi.c @@ -583,14 +583,6 @@ fu_plugin_uefi_coldplug_resource (FuPlugin *plugin, fwup_resource *re) guid, hardware_instance); dev = fu_device_new (); - if (uefi_type == FWUP_RESOURCE_TYPE_DEVICE_FIRMWARE) { - /* nothing better in the icon naming spec */ - fu_device_add_icon (dev, "audio-card"); - } else { - /* this is probably system firmware */ - fu_device_add_icon (dev, "computer"); - fu_device_add_guid (dev, "main-system-firmware"); - } fu_device_set_id (dev, id); fu_device_add_guid (dev, guid); fu_device_set_version (dev, version); @@ -612,6 +604,14 @@ fu_plugin_uefi_coldplug_resource (FuPlugin *plugin, fwup_resource *re) g_warning ("Kernel support for EFI variables missing"); } fu_device_add_flag (dev, FWUPD_DEVICE_FLAG_REQUIRE_AC); + if (uefi_type == FWUP_RESOURCE_TYPE_DEVICE_FIRMWARE) { + /* nothing better in the icon naming spec */ + fu_device_add_icon (dev, "audio-card"); + } else { + /* this is probably system firmware */ + fu_device_add_icon (dev, "computer"); + fu_device_add_guid (dev, "main-system-firmware"); + } fu_plugin_device_add (plugin, dev); }