colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cloud-setup: skip connections unless given type mismatches

Browse Source 
Wired and Ipv4 always there, rest varies by connection type (Wired,
Vlan, MacVlan).
This commit is contained in:
Lubomir Rintel
2024-11-19 12:33:02 +01:00
parent daef3b7b3f
commit 55ed4f7f6d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nm-cloud-setup/main.c
View File

@@ -394,11 +394,10 @@ _nmc_skip_connection_by_user_data(NMConnection *connection)
}
static gboolean
_nmc_skip_connection_by_type(NMConnection *connection)
_nmc_skip_connection_by_type(NMConnection *connection, const char *connection_type)
{
if (!nm_streq0(nm_connection_get_connection_type(connection), NM_SETTING_WIRED_SETTING_NAME))
if (!nm_streq0(nm_connection_get_connection_type(connection), connection_type))
return TRUE;
if (!nm_connection_get_setting_ip4_config(connection))
return TRUE;
@@ -639,7 +638,7 @@ try_again:
return any_changes;
}
if (_nmc_skip_connection_by_type(applied_connection)) {
if (_nmc_skip_connection_by_type(applied_connection, NM_SETTING_WIRED_SETTING_NAME)) {
_LOGD("config device %s: device has no suitable applied connection. Skip", hwaddr);
return any_changes;
}