diff --git a/data/daemon.conf b/data/daemon.conf index 085fcf94e..8352129a0 100644 --- a/data/daemon.conf +++ b/data/daemon.conf @@ -1,8 +1,5 @@ [fwupd] -# If we should verify option ROM images -EnableOptionROM=true - # Allow blacklisting specific devices by their GUID # Uses semicolons as delimiter BlacklistDevices= diff --git a/src/fu-config.c b/src/fu-config.c index 0b257229f..b4f8148ec 100644 --- a/src/fu-config.c +++ b/src/fu-config.c @@ -39,7 +39,6 @@ struct _FuConfig GPtrArray *monitors; GPtrArray *blacklist_devices; GPtrArray *blacklist_plugins; - gboolean enable_option_rom; }; 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_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 */ devices = g_key_file_get_string_list (self->keyfile, "fwupd", @@ -384,13 +376,6 @@ fu_config_get_blacklist_plugins (FuConfig *self) 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 fu_config_class_init (FuConfigClass *klass) { diff --git a/src/fu-config.h b/src/fu-config.h index 16bdea9bc..5ebc55d73 100644 --- a/src/fu-config.h +++ b/src/fu-config.h @@ -37,7 +37,6 @@ gboolean fu_config_load (FuConfig *self, GPtrArray *fu_config_get_blacklist_devices (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); FwupdRemote *fu_config_get_remote_by_id (FuConfig *self, const gchar *remote_id); diff --git a/src/fu-engine.c b/src/fu-engine.c index 5c7f87400..0887daa82 100644 --- a/src/fu-engine.c +++ b/src/fu-engine.c @@ -2852,13 +2852,6 @@ fu_engine_load (FuEngine *self, GError **error) 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 */ fu_engine_plugins_setup (self); g_usb_context_enumerate (self->usb_ctx);