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

cloud-setup: fix build

Browse Source 
Fixes: 6ff4b9e57c ('cloud-setup: create VLANs for multiple VNICs on OCI')
This commit is contained in:
Lubomir Rintel
2025-01-20 17:53:58 +01:00
parent cf6af54ffa
commit 79219553be
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/nm-manager.c
View File

@@ -6490,7 +6490,7 @@ find_device_for_activation(NMManager *self,
nm_assert(out_is_vpn);
if (!connection)
connection = nm_settings_connection_get_connection(sett_conn);
connection = nm_settings_connection_get_connection(sett_conn);
is_vpn = _connection_is_vpn(connection);

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

@@ -742,7 +742,7 @@ _oci_new_vlan_dev(SigTermData *sigterm_data,
gs_free char *connection_id = NULL;
char *ifname = NULL;
const char *ip4_config_method;
NMSettingUser *s_user;
NMSetting *s_user;
connection = nm_simple_connection_new();
@@ -799,7 +799,10 @@ _oci_new_vlan_dev(SigTermData *sigterm_data,
s_user = nm_setting_user_new();
nm_connection_add_setting(connection, s_user);
nm_setting_user_set_data(NM_SETTING_USER(s_user), NM_USER_TAG_ORIGIN, "nm-cloud-setup", NULL);
nm_setting_user_set_data(NM_SETTING_USER(s_user),
"org.freedesktop.NetworkManager.origin",
"nm-cloud-setup",
NULL);
_nmc_mangle_connection(NULL, connection, result, config_data, NULL, NULL);