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

config: fix filename order for config-description

Browse source 
The configuration snippets are loaded in alphabetical order.
Fix the printed description to reflect that order. Otherwise,
NM logs at startup:

  <info>  Read config: /etc/NetworkManager/NetworkManager.conf and conf.d: 20-connectivity-fedora.conf, 10-ibft-plugin.conf

(cherry picked from commit 6b0f84bdda)
This commit is contained in:
Thomas Haller 2015-04-17 13:24:32 +02:00
parent d546f8e2cc
commit 07433c81c7
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/nm-config.c
View file

@ -577,6 +577,7 @@ _get_config_dir_files (const char *config_main_file,
GPtrArray *confs;
GString *config_description;
const char *name;
guint i;
g_return_val_if_fail (config_main_file, NULL);
g_return_val_if_fail (config_dir, NULL);
@ -589,21 +590,27 @@ _get_config_dir_files (const char *config_main_file,
if (direnum) {
while ((info = g_file_enumerator_next_file (direnum, NULL, NULL))) {
name = g_file_info_get_name (info);
if (g_str_has_suffix (name, ".conf")) {
g_ptr_array_add (confs, g_build_filename (config_dir, name, NULL));
if (confs->len == 1)
g_string_append (config_description, " and conf.d: ");
else
g_string_append (config_description, ", ");
g_string_append (config_description, name);
}
if (g_str_has_suffix (name, ".conf"))
g_ptr_array_add (confs, g_strdup (name));
g_object_unref (info);
}
g_object_unref (direnum);
}
g_object_unref (dir);
g_ptr_array_sort (confs, sort_asciibetically);
if (confs->len > 0) {
g_ptr_array_sort (confs, sort_asciibetically);
g_string_append (config_description, " and conf.d: ");
for (i = 0; i < confs->len; i++) {
char *n = confs->pdata[i];
if (i > 0)
g_string_append (config_description, ", ");
g_string_append (config_description, n);
confs->pdata[i] = g_build_filename (config_dir, n, NULL);
g_free (n);
}
}
*out_config_description = g_string_free (config_description, FALSE);
return confs;