fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 11:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 8df0a5f1c4
commit 81a239ef3b
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -391,11 +391,10 @@ _nmc_skip_connection_by_user_data(NMConnection *connection)
} }
static gboolean 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; return TRUE;
if (!nm_connection_get_setting_ip4_config(connection)) if (!nm_connection_get_setting_ip4_config(connection))
return TRUE; return TRUE;
@ -636,7 +635,7 @@ try_again:
return any_changes; 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); _LOGD("config device %s: device has no suitable applied connection. Skip", hwaddr);
return any_changes; return any_changes;
} }