mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-02-03 20:40:34 +01:00
Revert "core: prevent the activation of unavailable OVS interfaces only"
This was a workaround until the real cause of the issue was found.
This reverts commit a1c05d2ce6.
This commit is contained in:
parent
40ddff9cc9
commit
ba86c208e0
1 changed files with 4 additions and 10 deletions
|
|
@ -4689,16 +4689,10 @@ found_better:
|
||||||
if (nm_g_hash_table_contains(exclude_devices, device))
|
if (nm_g_hash_table_contains(exclude_devices, device))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* During startup, NM performs a cleanup of the ovsdb to remove previous entries.
|
if (!nm_device_is_available(device,
|
||||||
* Before the device is suitable for the connection, it must have ovsdb->ready set
|
for_user_request
|
||||||
* to TRUE. Performing this check in all kind of interfaces is too agressive and leads
|
? NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST
|
||||||
* to race conditions, e.g when a non-virtual bond port gets a carrier, preventing the
|
: NM_DEVICE_CHECK_DEV_AVAILABLE_NONE))
|
||||||
* device to be a good candidate for the connection. */
|
|
||||||
if (nm_device_get_device_type(device) == NM_DEVICE_TYPE_OVS_INTERFACE
|
|
||||||
&& !nm_device_is_available(device,
|
|
||||||
for_user_request
|
|
||||||
? NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST
|
|
||||||
: NM_DEVICE_CHECK_DEV_AVAILABLE_NONE))
|
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
/* determine the priority of this device. Currently, this priority is independent
|
/* determine the priority of this device. Currently, this priority is independent
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue