fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-07 19:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cloud-setup: lookup device by MAC + type instead of just MAC

Browse source 
This will be useful for updating configuration of Vlans and MacVlans,
some of having same MAC addresses as devices of other type.
This commit is contained in:
Lubomir Rintel 2024-11-19 12:30:05 +01:00
parent ff036c82af
commit 5143e49c99
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -292,7 +292,7 @@ _nmc_get_ethernet_hwaddrs(NMClient *nmc)
}
static NMDevice *
_nmc_get_device_by_hwaddr(NMClient *nmc, const char *hwaddr)
_nmc_get_device_by_hwaddr(NMClient *nmc, NMDeviceType device_type, const char *hwaddr)
{
const GPtrArray *devices;
guint i;
@ -304,7 +304,7 @@ _nmc_get_device_by_hwaddr(NMClient *nmc, const char *hwaddr)
const char *hwaddr_dev;
gs_free char *s = NULL;
if (!NM_IS_DEVICE_ETHERNET(device))
if (nm_device_get_device_type(device) != device_type)
continue;
hwaddr_dev = _device_get_hwaddr(device);
@ -587,7 +587,7 @@ _config_one(SigTermData *sigterm_data,
if (g_cancellable_is_cancelled(sigterm_data->cancellable))
return FALSE;
device = nm_g_object_ref(_nmc_get_device_by_hwaddr(nmc, hwaddr));
device = nm_g_object_ref(_nmc_get_device_by_hwaddr(nmc, NM_DEVICE_TYPE_ETHERNET, hwaddr));
if (!device) {
_LOGD("config device %s: skip because device not found", hwaddr);
return FALSE;