trivial: Load the custom ESP mountpoint from _setup()

This commit is contained in:
Richard Hughes 2018-03-07 10:08:03 +00:00
parent 89e968b79b
commit afd05b88bd

View File

@ -596,7 +596,7 @@ fu_plugin_uefi_test_secure_boot (FuPlugin *plugin)
}
static gboolean
load_custom_esp (FuPlugin *plugin, GError **error)
fu_plugin_uefi_set_custom_mountpoint (FuPlugin *plugin, GError **error)
{
FuPluginData *data = fu_plugin_get_data (plugin);
const gchar *key = "OverrideESPMountPoint";
@ -621,6 +621,15 @@ load_custom_esp (FuPlugin *plugin, GError **error)
return TRUE;
}
gboolean
fu_plugin_startup (FuPlugin *plugin, GError **error)
{
/* load any overriden options */
if (!fu_plugin_uefi_set_custom_mountpoint (plugin, error))
return FALSE;
return TRUE;
}
gboolean
fu_plugin_coldplug (FuPlugin *plugin, GError **error)
{
@ -673,10 +682,6 @@ fu_plugin_coldplug (FuPlugin *plugin, GError **error)
while (fwup_resource_iter_next (iter, &re) > 0)
fu_plugin_uefi_coldplug_resource (plugin, re);
/* load any overriden options */
if (!load_custom_esp (plugin, error))
return FALSE;
/* for debugging problems later */
fu_plugin_uefi_test_secure_boot (plugin);
if (data->ux_capsule)