mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 13:47:58 +02:00
ifupdown: don't tell NM about connections until we check 'managed' (lp:450458)
Otherwise it causes connections that we don't want exported to leak out and be shown in the connection editor even though the device isn't supposed to be managed.
This commit is contained in:
parent
6b7ec3894a
commit
37e8ae824e
1 changed files with 13 additions and 1 deletions
|
|
@ -374,7 +374,6 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
|
|||
if (exported) {
|
||||
g_hash_table_insert (priv->iface_connections, block->name, exported);
|
||||
g_hash_table_insert (priv->well_known_interfaces, block->name, "known");
|
||||
g_signal_emit_by_name (self, NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED, exported);
|
||||
}
|
||||
} else if (!strcmp ("mapping", block->type)) {
|
||||
g_hash_table_insert (priv->well_known_interfaces, block->name, "known");
|
||||
|
|
@ -442,6 +441,19 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
|
|||
}
|
||||
g_list_free (keys);
|
||||
|
||||
/* Now if we're running in managed mode, let NM know there are new connections */
|
||||
if (!priv->unmanage_well_known) {
|
||||
GList *con_list = g_hash_table_get_values (priv->iface_connections);
|
||||
GList *cl_iter;
|
||||
|
||||
for (cl_iter = con_list; cl_iter; cl_iter = g_list_next (cl_iter)) {
|
||||
g_signal_emit_by_name (self,
|
||||
NM_SYSTEM_CONFIG_INTERFACE_CONNECTION_ADDED,
|
||||
NM_EXPORTED_CONNECTION (cl_iter->data));
|
||||
}
|
||||
g_list_free (con_list);
|
||||
}
|
||||
|
||||
PLUGIN_PRINT("SCPlugin-Ifupdown", "end _init.");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue