diff options
Diffstat (limited to 'src/core/settings/plugins/ifupdown')
3 files changed, 8 insertions, 8 deletions
diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c index a8a9c40a..84986877 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c @@ -112,7 +112,7 @@ _recursive_ifparser(if_parser *parser, const char *eni_file, int quiet) /* Check if interfaces file exists and open it */ if (!g_file_test(eni_file, G_FILE_TEST_EXISTS)) { if (!quiet) - _LOGW("interfaces file %s doesn't exist", eni_file); + _LOGI("interfaces file %s doesn't exist", eni_file); return; } inp = fopen(eni_file, "re"); diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c index db6b1aef..5bad2362 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-parser.c @@ -397,7 +397,7 @@ ifupdown_ip4_add_dns(NMSettingIPConfig *s_ip4, const char *dns) if (dns == NULL) return; - list = nm_utils_strsplit_set(dns, " \t"); + list = nm_strsplit_set(dns, " \t"); for (iter = list; iter && *iter; iter++) { if (!inet_pton(AF_INET, *iter, &addr)) { _LOGW(" ignoring invalid nameserver '%s'", *iter); @@ -497,7 +497,7 @@ update_ip4_setting_from_if_block(NMConnection *connection, if_block *block, GErr gs_free const char **list = NULL; const char ** iter; - list = nm_utils_strsplit_set(search_v, " \t"); + list = nm_strsplit_set(search_v, " \t"); for (iter = list; iter && *iter; iter++) { if (!nm_setting_ip_config_add_dns_search(s_ip4, *iter)) _LOGW(" duplicate DNS domain '%s'", *iter); @@ -521,7 +521,7 @@ ifupdown_ip6_add_dns(NMSettingIPConfig *s_ip6, const char *dns) if (dns == NULL) return; - list = nm_utils_strsplit_set(dns, " \t"); + list = nm_strsplit_set(dns, " \t"); for (iter = list; iter && *iter; iter++) { if (!inet_pton(AF_INET6, *iter, &addr)) { _LOGW(" ignoring invalid nameserver '%s'", *iter); @@ -605,7 +605,7 @@ update_ip6_setting_from_if_block(NMConnection *connection, if_block *block, GErr gs_free const char **list = NULL; const char ** iter; - list = nm_utils_strsplit_set(search_v, " \t"); + list = nm_strsplit_set(search_v, " \t"); for (iter = list; iter && *iter; iter++) { if (!nm_setting_ip_config_add_dns_search(s_ip6, *iter)) _LOGW(" duplicate DNS domain '%s'", *iter); diff --git a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c index 80a5638a..602a7327 100644 --- a/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c +++ b/src/core/settings/plugins/ifupdown/nms-ifupdown-plugin.c @@ -189,7 +189,7 @@ _unmanaged_specs(GHashTable *eni_ifaces) GSList * specs = NULL; guint i, len; - keys = nm_utils_strdict_get_keys(eni_ifaces, TRUE, &len); + keys = nm_strdict_get_keys(eni_ifaces, TRUE, &len); for (i = len; i > 0;) { i--; specs = g_slist_prepend(specs, @@ -264,7 +264,7 @@ load_eni_ifaces(NMSIfupdownPlugin *self) _LOGD("parse: found bridge ports %s for %s", ports, block->name); - port_ifaces = nm_utils_strsplit_set(ports, " \t"); + port_ifaces = nm_strsplit_set(ports, " \t"); for (i = 0; port_ifaces && port_ifaces[i]; i++) { const char *token = port_ifaces[i]; @@ -323,7 +323,7 @@ load_eni_ifaces(NMSIfupdownPlugin *self) NM_PRINT_FMT_QUOTED(local, " (", local->message, ")", "")); sd = NULL; } else { - nmtst_connection_assert_unchanging(connection); + nm_assert_connection_unchanging(connection); uuid = nm_connection_get_uuid(connection); if (!storage) |