proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 15:23:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: Remove EnableOptionROM from daemon.conf

Browse Source 
The exact same thing can be done using BlacklistPlugins=udev
This commit is contained in:
Richard Hughes 2017-09-19 11:07:12 +01:00
parent c2af1964b9
commit 10bd8ecfb8
4 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/daemon.conf
View File

@ -1,8 +1,5 @@
[fwupd] [fwupd]
# If we should verify option ROM images
EnableOptionROM=true
# Allow blacklisting specific devices by their GUID # Allow blacklisting specific devices by their GUID
# Uses semicolons as delimiter # Uses semicolons as delimiter
BlacklistDevices= BlacklistDevices=

15
src/fu-config.c
View File

@ -39,7 +39,6 @@ struct _FuConfig
GPtrArray *monitors; GPtrArray *monitors;
GPtrArray *blacklist_devices; GPtrArray *blacklist_devices;
GPtrArray *blacklist_plugins; GPtrArray *blacklist_plugins;
gboolean enable_option_rom;
}; };
G_DEFINE_TYPE (FuConfig, fu_config, G_TYPE_OBJECT) G_DEFINE_TYPE (FuConfig, fu_config, G_TYPE_OBJECT)
@ -308,13 +307,6 @@ fu_config_load (FuConfig *self, GError **error)
G_CALLBACK (fu_config_monitor_changed_cb), self); G_CALLBACK (fu_config_monitor_changed_cb), self);
g_ptr_array_add (self->monitors, monitor); g_ptr_array_add (self->monitors, monitor);
/* optional, at the moment */
self->enable_option_rom =
g_key_file_get_boolean (self->keyfile,
"fwupd",
"EnableOptionROM",
NULL);
/* get blacklisted devices */ /* get blacklisted devices */
devices = g_key_file_get_string_list (self->keyfile, devices = g_key_file_get_string_list (self->keyfile,
"fwupd", "fwupd",
@ -384,13 +376,6 @@ fu_config_get_blacklist_plugins (FuConfig *self)
return self->blacklist_plugins; return self->blacklist_plugins;
} }
gboolean
fu_config_get_enable_option_rom (FuConfig *self)
{
g_return_val_if_fail (FU_IS_CONFIG (self), FALSE);
return self->enable_option_rom;
}
static void static void
fu_config_class_init (FuConfigClass *klass) fu_config_class_init (FuConfigClass *klass)
{ {

1
src/fu-config.h
View File

@ -37,7 +37,6 @@ gboolean fu_config_load (FuConfig *self,
GPtrArray *fu_config_get_blacklist_devices (FuConfig *self); GPtrArray *fu_config_get_blacklist_devices (FuConfig *self);
GPtrArray *fu_config_get_blacklist_plugins (FuConfig *self); GPtrArray *fu_config_get_blacklist_plugins (FuConfig *self);
gboolean fu_config_get_enable_option_rom (FuConfig *self);
GPtrArray *fu_config_get_remotes (FuConfig *self); GPtrArray *fu_config_get_remotes (FuConfig *self);
FwupdRemote *fu_config_get_remote_by_id (FuConfig *self, FwupdRemote *fu_config_get_remote_by_id (FuConfig *self,
const gchar *remote_id); const gchar *remote_id);

7
src/fu-engine.c
View File

@ -2852,13 +2852,6 @@ fu_engine_load (FuEngine *self, GError **error)
return FALSE; return FALSE;
} }
/* disable udev? */
if (!fu_config_get_enable_option_rom (self->config)) {
FuPlugin *plugin = g_hash_table_lookup (self->plugins_hash, "udev");
if (plugin != NULL)
fu_plugin_set_enabled (plugin, FALSE);
}
/* add devices */ /* add devices */
fu_engine_plugins_setup (self); fu_engine_plugins_setup (self);
g_usb_context_enumerate (self->usb_ctx); g_usb_context_enumerate (self->usb_ctx);