ebf02b63fe
- bond: fix crash comparing mode while generating bond connection (rh #1459580) - connectivity: fix route penalty if WWAN and BT device using ip-ifindex (rh #1459932) - device: persist nm-owned in run state (rh #1376199) - device: fix assuming master device on restart (rh #1452062) - device: apply route metric penality only when the default route exists (rh #1459604) - connectivity: fix periodic connectivity check (rh #1458399) - bond: improve option matching on daemon restart (rh #1457909) - device: fix touching device after external activation (rh #1457242)
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From b905393348574d8a363fe3fac4afb2fe6b03cfc0 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Haller <thaller@redhat.com>
|
|
Date: Thu, 1 Jun 2017 22:04:26 +0200
|
|
Subject: [PATCH 1/1] device: mark device as sys-iface-state=external when
|
|
assuming connection
|
|
|
|
Since commit 74dac5f (nm-manager: try assuming connections on managed devices),
|
|
and commit f4226e7 (manager: avoid generating in memory connections
|
|
during startup for managed devices), recheck_assume_connection() also
|
|
assumes connections on devices that are currently not in sys-iface-state
|
|
"external".
|
|
|
|
That is correct, as also for fully managed devices (which are currently
|
|
in disconnected state), we want to assume external connections. However,
|
|
when doing that, we must reset the sys-iface-state to external.
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1457242
|
|
(cherry picked from commit 02e7476e9fd0f4248009ce8eaa7870ba05e2504e)
|
|
(cherry picked from commit fcbcd1aa870ec5aa74c5c570ea08ffc52cffa63e)
|
|
---
|
|
src/nm-manager.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/nm-manager.c b/src/nm-manager.c
|
|
index 3d94ce9..283ceda 100644
|
|
--- a/src/nm-manager.c
|
|
+++ b/src/nm-manager.c
|
|
@@ -1884,8 +1884,10 @@ recheck_assume_connection (NMManager *self,
|
|
_LOGD (LOGD_DEVICE, "(%s): will attempt to assume connection",
|
|
nm_device_get_iface (device));
|
|
|
|
- if (!generated)
|
|
- nm_device_sys_iface_state_set (device, NM_DEVICE_SYS_IFACE_STATE_ASSUME);
|
|
+ nm_device_sys_iface_state_set (device,
|
|
+ generated
|
|
+ ? NM_DEVICE_SYS_IFACE_STATE_EXTERNAL
|
|
+ : NM_DEVICE_SYS_IFACE_STATE_ASSUME);
|
|
|
|
/* Move device to DISCONNECTED to activate the connection */
|
|
if (state == NM_DEVICE_STATE_UNMANAGED) {
|
|
--
|
|
2.9.4
|
|
|