diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2019-02-26 10:07:36 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2019-03-04 10:47:00 +0100 |
| commit | 93bbe436958264d5f720ce095b3f390ce50fc732 (patch) | |
| tree | 3374504b41733255c44e51dd727db3571a5c6471 | |
| parent | 6580f2931dd76d3dd0acf574c4ae563e3875fcb5 (diff) | |
| download | NetworkManager-93bbe436958264d5f720ce095b3f390ce50fc732.tar.gz | |
manager: ignore ovs-system master when assuming connections
This change allows NM to assume after a restart a device that has been
enslaved externally to an ovs bridge.
https://bugzilla.redhat.com/show_bug.cgi?id=1676551
| -rw-r--r-- | src/nm-manager.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index ce0d7c482f..0bf6a75102 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2487,7 +2487,12 @@ get_existing_connection (NMManager *self, if (ifindex) { int master_ifindex = nm_platform_link_get_master (priv->platform, ifindex); - if (master_ifindex) { + /* Check that the master is activating before assuming a + * slave connection. However, ignore ovs-system master as + * we never manage it. + */ + if ( master_ifindex + && nm_platform_link_get_type (priv->platform, master_ifindex) != NM_LINK_TYPE_OPENVSWITCH) { master = nm_manager_get_device_by_ifindex (self, master_ifindex); if (!master) { _LOG2D (LOGD_DEVICE, device, "assume: don't assume because " |