fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-08 03:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ifcfg-rh: fix handling of runtime NM_CONTROLLED=yes -> no changes

Browse source 
We were accidentally removing the connection from priv->connections
(and thus from unmanaged-specs) when NM_CONTROLLED changed to no when
rereading a changed connection file.
This commit is contained in:
Dan Winship 2013-11-01 12:13:23 -04:00
parent 84672c73e3
commit 0065bd6643
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/settings/plugins/ifcfg-rh/plugin.c
View file

@ -233,6 +233,7 @@ connection_new_or_changed (SCPluginIfcfg *self,
NMIfcfgConnection *existing,
char **out_old_path)
{
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (self);
NMIfcfgConnection *new;
GError *error = NULL;
gboolean ignore_error = FALSE;
@ -315,7 +316,13 @@ connection_new_or_changed (SCPluginIfcfg *self,
/* Remove the path so that claim_connection() doesn't complain later when
* interface gets managed and connection is re-added. */
nm_connection_set_path (NM_CONNECTION (existing), NULL);
g_object_unref (existing);
/* signal_remove() will end up removing the connection from our hash,
* so add it back now.
*/
g_hash_table_insert (priv->connections,
g_strdup (nm_connection_get_uuid (NM_CONNECTION (existing))),
existing);
}
} else {
if (old_unmanaged) { /* now managed */