diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-12-12 14:34:21 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-12-12 14:43:27 +0100 |
| commit | e273d83db36db063320f1c96dc067bd62d908adc (patch) | |
| tree | b9b78e340d940054a1b381300dc9a2f472b50dc6 | |
| parent | e4b90bf36aefde59e6091151a4c32028cc13d74d (diff) | |
| download | NetworkManager-bg/manager-state-bgo776001.tar.gz | |
manager: don't upgrade the state when connectivity check failsbg/manager-state-bgo776001bg/connectivity
If a connection is ACTIVATED and another one is ACTIVATING but there
is no global connectivity, we currently set the manager state to
CONNECTING and start a connectivity check to verify whether the
manager state can be promoted to CONNECTED_GLOBAL.
If this connectivity check fails, we shouldn't promote a CONNECTING
state to CONNECTED_SITE.
Fixes: 084da69a305be740b5e3cd3e6d3a9a827657a81d
| -rw-r--r-- | src/nm-manager.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 0629a3cb61..78367ad8f7 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -757,9 +757,7 @@ checked_connectivity (GObject *object, GAsyncResult *result, gpointer user_data) if (connectivity == NM_CONNECTIVITY_FULL) set_state (manager, NM_STATE_CONNECTED_GLOBAL); - else if ( connectivity == NM_CONNECTIVITY_PORTAL - || connectivity == NM_CONNECTIVITY_LIMITED) - set_state (manager, NM_STATE_CONNECTED_SITE); + _notify (manager, PROP_CONNECTIVITY); } |