summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2014-12-22 19:16:01 +0100
committerThomas Haller <thaller@redhat.com>2014-12-22 19:16:17 +0100
commit49f3cd942d13b5edc87e3911e4c40bf500985b55 (patch)
tree3657e1f3717c6d449bd6da97dce2fe4223ebf747
parent7e5b0c9c90b4de43696819ccfafab3bf5bb939f0 (diff)
downloadNetworkManager-th/uuid-duplicate-rh1171751-2.tar.gz
-rw-r--r--src/settings/plugins/keyfile/plugin.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 8390766e01..f9236a3e32 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -521,6 +521,7 @@ load_connection (NMSystemConfigInterface *config,
SCPluginKeyfile *self = SC_PLUGIN_KEYFILE (config);
NMKeyfileConnection *connection;
int dir_len = strlen (KEYFILE_DIR);
+ gboolean protect_existing_connection;
if ( strncmp (filename, KEYFILE_DIR, dir_len) != 0
|| filename[dir_len] != '/'
@@ -530,7 +531,9 @@ load_connection (NMSystemConfigInterface *config,
if (nm_keyfile_plugin_utils_should_ignore_file (filename + dir_len + 1))
return FALSE;
- connection = update_connection (self, NULL, filename, find_by_path (self, filename), FALSE, NULL, NULL);
+ protect_existing_connection = TRUE;
+
+ connection = update_connection (self, NULL, filename, find_by_path (self, filename), protect_existing_connection, NULL, NULL);
return (connection != NULL);
}