diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-12-11 11:35:11 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-12-11 13:13:05 +0100 |
| commit | e7e0909d445169b0e34df31a2d2fa1055b40f4ba (patch) | |
| tree | 1e7f67737051ea84292a008ba685d541c060a735 /src/nm-config.c | |
| parent | 62c9d8c109074a9179a0303150ab353286464348 (diff) | |
| download | NetworkManager-e7e0909d445169b0e34df31a2d2fa1055b40f4ba.tar.gz | |
config: add nm_config_data_get_warnings() to get additional warnings about wrong configuration
No additional warnings are implemented yet.
(cherry picked from commit 8d20b9363b4461c7e86f2310a2fbfe88a09d5284)
Diffstat (limited to 'src/nm-config.c')
| -rw-r--r-- | src/nm-config.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index 7d5be95c61..a7bb350302 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -2603,11 +2603,6 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi return; } - if (emit_warnings) { - for (i = 0; i < warnings->len; i++) - _LOGW ("%s", (const char *) warnings->pdata[i]); - } - no_auto_default = no_auto_default_from_file (priv->no_auto_default_file); keyfile_intern = intern_config_read (priv->intern_config_file, @@ -2624,6 +2619,13 @@ nm_config_reload (NMConfig *self, NMConfigChangeFlags reload_flags, gboolean emi (const char *const*) no_auto_default, keyfile, keyfile_intern); + + if (emit_warnings) { + nm_config_data_get_warnings (priv->config_data_orig, warnings); + for (i = 0; i < warnings->len; i++) + _LOGW ("%s", (const char *) warnings->pdata[i]); + } + g_free (config_main_file); g_free (config_description); g_key_file_unref (keyfile); @@ -2855,6 +2857,8 @@ init_sync (GInitable *initable, GCancellable *cancellable, GError **error) keyfile, keyfile_intern); + nm_config_data_get_warnings (priv->config_data_orig, warnings); + priv->config_data = g_object_ref (priv->config_data_orig); if (warnings->len > 0) { g_ptr_array_add (warnings, NULL); |