From eb634c6077e5ef1cdd615bdf7186a565bf9b60db Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 2 Jul 2021 08:21:07 +0200 Subject: [PATCH] core: don't override user provided "connection.interface-name" in nm_utils_complete_generic() nm_utils_complete_generic() is supposed to complete information which the user didn't provide. If the profile already has an interface-name, keep it. --- src/core/NetworkManagerUtils.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/NetworkManagerUtils.c b/src/core/NetworkManagerUtils.c index 34ddf9fb1a..e670546210 100644 --- a/src/core/NetworkManagerUtils.c +++ b/src/core/NetworkManagerUtils.c @@ -268,7 +268,9 @@ nm_utils_complete_generic(NMPlatform * platform, } /* Add an interface name, if requested */ - if (ifname) { + if (nm_setting_connection_get_interface_name(s_con)) { + /* pass */ + } else if (ifname) { g_object_set(G_OBJECT(s_con), NM_SETTING_CONNECTION_INTERFACE_NAME, ifname, NULL); } else if (ifname_prefix && !nm_setting_connection_get_interface_name(s_con)) { generated_ifname = get_new_connection_ifname(platform, existing_connections, ifname_prefix);