fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-29 01:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: fix ignoring internal [.config] section

Browse source 
The [.config] section is configuration about the configuration file itself,
it should not be merged.

Properly ignore the [.config] section before merging the configuration
file.

(cherry picked from commit ca5028e608)
This commit is contained in:
Thomas Haller 2016-05-31 09:19:40 +02:00
parent 390778edec
commit 265cfd7dee
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nm-config.c
View file

@ -647,7 +647,7 @@ read_config (GKeyFile *keyfile, gboolean is_base_config, const char *dirname, co
/* the config-group is internal to every configuration snippets. It doesn't make sense
* to merge the into the global configuration, and it doesn't make sense to preserve the
* group beyond this point. */
g_key_file_remove_group (keyfile, NM_CONFIG_KEYFILE_GROUP_CONFIG, NULL);
g_key_file_remove_group (kf, NM_CONFIG_KEYFILE_GROUP_CONFIG, NULL);
/* Override the current settings with the new ones */
groups = g_key_file_get_groups (kf, &ngroups);