Blame SOURCES/1005-manager-ignore-ovs-system-master-when-assuming-rh1676551.patch
|
 |
e34cdd |
From 14990584112a3740acb404f7085f1b5ed0cfb4f9 Mon Sep 17 00:00:00 2001
|
|
|
e34cdd |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
e34cdd |
Date: Tue, 26 Feb 2019 10:07:36 +0100
|
|
|
e34cdd |
Subject: [PATCH] manager: ignore ovs-system master when assuming
|
|
|
e34cdd |
connections
|
|
|
e34cdd |
|
|
|
e34cdd |
This change allows to assume after restart a device that has been
|
|
|
e34cdd |
enslaved externally to an ovs bridge.
|
|
|
e34cdd |
|
|
|
e34cdd |
https://bugzilla.redhat.com/show_bug.cgi?id=1676551
|
|
|
e34cdd |
(cherry picked from commit 23b0f943b7408da77b51e83a16de604b52704a1d)
|
|
|
e34cdd |
---
|
|
|
e34cdd |
src/nm-manager.c | 7 ++++++-
|
|
|
e34cdd |
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
e34cdd |
|
|
|
e34cdd |
diff --git a/src/nm-manager.c b/src/nm-manager.c
|
|
|
e34cdd |
index 289dcf838..225eb1f70 100644
|
|
|
e34cdd |
--- a/src/nm-manager.c
|
|
|
e34cdd |
+++ b/src/nm-manager.c
|
|
|
e34cdd |
@@ -2405,7 +2405,12 @@ get_existing_connection (NMManager *self,
|
|
|
e34cdd |
if (ifindex) {
|
|
|
e34cdd |
int master_ifindex = nm_platform_link_get_master (priv->platform, ifindex);
|
|
|
e34cdd |
|
|
|
e34cdd |
- if (master_ifindex) {
|
|
|
e34cdd |
+ /* Check that the master is activating before assuming a
|
|
|
e34cdd |
+ * slave connection. However, ignore ovs-system master as
|
|
|
e34cdd |
+ * we never manage it.
|
|
|
e34cdd |
+ */
|
|
|
e34cdd |
+ if ( master_ifindex
|
|
|
e34cdd |
+ && nm_platform_link_get_type (priv->platform, master_ifindex) != NM_LINK_TYPE_OPENVSWITCH) {
|
|
|
e34cdd |
master = nm_manager_get_device_by_ifindex (self, master_ifindex);
|
|
|
e34cdd |
if (!master) {
|
|
|
e34cdd |
_LOG2D (LOGD_DEVICE, device, "assume: don't assume because "
|
|
|
e34cdd |
--
|
|
|
e34cdd |
2.20.1
|
|
|
e34cdd |
|