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

initrd/cmdline: drop useless call to normalize

Browse source 
The caller normalizes connections before spitting them out. On top of it
it actually handles the errors.

Rename the routine accordingly.
This commit is contained in:
Lubomir Rintel 2024-12-12 21:54:16 +01:00
parent 3bcbe6ed01
commit 6e52a8ab9e
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/nm-initrd-generator/nmi-cmdline-reader.c
View file

@ -1279,7 +1279,7 @@ reader_parse_ethtool(Reader *reader, char *argument)
}
static void
_normalize_conn(gpointer key, gpointer value, gpointer user_data)
_fixup_ip_sett(gpointer key, gpointer value, gpointer user_data)
{
NMConnection *connection = value;
NMSettingIPConfig *s_ip4 = NULL, *s_ip6 = NULL;
@ -1316,8 +1316,6 @@ _normalize_conn(gpointer key, gpointer value, gpointer user_data)
NULL);
}
}
nm_connection_normalize(connection, NULL, NULL, NULL);
}
static void
@ -1620,7 +1618,7 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir,
_LOGW(LOGD_CORE, "Mismatch between rd.znet_ifname and rd.znet");
}
g_hash_table_foreach(reader->hash, _normalize_conn, NULL);
g_hash_table_foreach(reader->hash, _fixup_ip_sett, NULL);
NM_SET_OUT(hostname, g_steal_pointer(&reader->hostname));