diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 6d73983e3..07f76bcc5 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -179,7 +179,7 @@ function write_config($desc = '', $backup = true) if (function_exists('plugins_interfaces')) { /* only pull plugins if plugins.inc was included before */ - plugins_interfaces(false); + plugins_interfaces(); } $cnf = OPNsense\Core\Config::getInstance(); diff --git a/src/etc/inc/plugins.inc b/src/etc/inc/plugins.inc index 87e926396..ba1ddf36c 100644 --- a/src/etc/inc/plugins.inc +++ b/src/etc/inc/plugins.inc @@ -94,12 +94,11 @@ function plugins_syslog() * Every _interface should return a named array containing the interface unique identifier and properties. * */ -function plugins_interfaces($write_allowed = true) +function plugins_interfaces() { global $config; $stale_interfaces = array(); - $write_required = false; // mark previous dynamic registrations stale if (isset($config['interfaces'])) { @@ -135,7 +134,6 @@ function plugins_interfaces($write_allowed = true) foreach ($intf_data as $prop_name => $prop_value) { if ((empty($intf_config[$prop_name]) && !empty($prop_value)) || $intf_config[$prop_name] != $prop_value) { $intf_config[$prop_name] = $prop_value; - $write_required = true; } } } @@ -147,14 +145,8 @@ function plugins_interfaces($write_allowed = true) foreach ($stale_interfaces as $intf_ref => $no_data) { if (isset($config['interfaces'][$intf_ref])) { unset($config['interfaces'][$intf_ref]); - $write_required = true; } } - - // configuration changed, materialize - if ($write_allowed && $write_required) { - write_config(); - } } function plugins_configure()