From 14990584112a3740acb404f7085f1b5ed0cfb4f9 Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Tue, 26 Feb 2019 10:07:36 +0100
Subject: [PATCH] manager: ignore ovs-system master when assuming
connections
This change allows to assume after restart a device that has been
enslaved externally to an ovs bridge.
https://bugzilla.redhat.com/show_bug.cgi?id=1676551
(cherry picked from commit 23b0f943b7408da77b51e83a16de604b52704a1d)
---
src/nm-manager.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 289dcf838..225eb1f70 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2405,7 +2405,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 "
--
2.20.1