colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keyfile: write ethernet group always on the top of the file

Browse Source
This commit is contained in:
Ana Cabral
2022-02-10 09:08:45 +01:00
parent 43eb4b3bfb
commit 20aa8d049c
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libnm-core-impl/nm-keyfile-utils.c
View File

@@ -682,3 +682,22 @@ nm_keyfile_key_decode(const char *key, char **out_to_free)
#endif
return name;
}
void
nm_keyfile_add_group(GKeyFile *keyfile, const char *group)
{
nm_assert(keyfile);
nm_assert(group);
/* You can only call this function if the group doesn't exist yet.
* Because, we are about to add a dummy key, so we would have to
* be sure that the key doesn't exist. */
nm_assert(!g_key_file_has_group(keyfile, group));
/* Ensure the group is present.
* There is no API for that, so add and remove a dummy key.
* For a profile it matters whether a setting is present or not,
* and we need to ensure that we persist the presence of the setting to keyfile*/
g_key_file_set_value(keyfile, group, ".X", "1");
g_key_file_remove_key(keyfile, group, ".X", NULL);
}

18
src/libnm-core-impl/nm-keyfile.c
View File

@@ -2305,8 +2305,21 @@ wired_s390_options_writer_full(KeyfileWriterInfo *info,
{
NMSettingWired *s_wired = NM_SETTING_WIRED(setting);
guint i, n;
const char *setting_alias;
n = nm_setting_wired_get_num_s390_options(s_wired);
if (n == 0)
return;
setting_alias = nm_keyfile_plugin_get_alias_for_setting_name(NM_SETTING_WIRED_SETTING_NAME);
if (!g_key_file_has_group(info->keyfile, NM_SETTING_WIRED_SETTING_NAME)
&& !g_key_file_has_group(info->keyfile, setting_alias)) {
/* groups in the keyfile are ordered. When we are about to add [ethernet-s390-options],
* we want to also have an [ethernet] group, first. */
nm_keyfile_add_group(info->keyfile, setting_alias ?: NM_SETTING_WIRED_SETTING_NAME);
}
for (i = 0; i < n; i++) {
gs_free char *key_to_free = NULL;
const char *opt_key;
@@ -4190,10 +4203,7 @@ nm_keyfile_write(NMConnection *connection,
|| g_key_file_has_group(info.keyfile, setting_name)) {
/* we have a section for the setting. Nothing to do. */
} else {
/* ensure the group is present. There is no API for that, so add and remove
* a dummy key. */
g_key_file_set_value(info.keyfile, setting_alias ?: setting_name, ".X", "1");
g_key_file_remove_key(info.keyfile, setting_alias ?: setting_name, ".X", NULL);
nm_keyfile_add_group(info.keyfile, setting_alias ?: setting_name);
}
if (NM_IS_SETTING_WIREGUARD(setting)) {

2
src/libnm-core-intern/nm-keyfile-utils.h
View File

@@ -92,4 +92,6 @@ const char *nm_keyfile_key_encode(const char *name, char **out_to_free);
const char *nm_keyfile_key_decode(const char *key, char **out_to_free);
void nm_keyfile_add_group(GKeyFile *keyfile, const char *group);
#endif /* __NM_KEYFILE_UTILS_H__ */