From 6e52a8ab9e693e73b4dd1b8ddad1c6dca8d73692 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 12 Dec 2024 21:54:16 +0100 Subject: [PATCH] initrd/cmdline: drop useless call to normalize The caller normalizes connections before spitting them out. On top of it it actually handles the errors. Rename the routine accordingly. --- src/nm-initrd-generator/nmi-cmdline-reader.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/nm-initrd-generator/nmi-cmdline-reader.c b/src/nm-initrd-generator/nmi-cmdline-reader.c index 80fb550ce1..e72f8a3b18 100644 --- a/src/nm-initrd-generator/nmi-cmdline-reader.c +++ b/src/nm-initrd-generator/nmi-cmdline-reader.c @@ -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));