diff options
| author | Michael Biebl <biebl@debian.org> | 2016-08-26 20:37:02 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2016-08-26 20:37:04 +0200 |
| commit | 73a186cb978b09724bc4fc5cef0745d6b5d62e35 (patch) | |
| tree | 004111c6609408197fbadb2ed816f6be94480e26 | |
| parent | 71d8c9a67afa9fb667c32eecac8484a8415e9860 (diff) | |
Correctly set the connectivity state if we enforce online mode with unmanaged devices
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 44051faa..51c60892 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +network-manager (1.4.0-2) UNRELEASED; urgency=medium + + * Correctly set the connectivity state if we enforce online mode with + unmanaged devices. + + -- Michael Biebl <biebl@debian.org> Fri, 26 Aug 2016 20:32:37 +0200 + network-manager (1.4.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 628ccd77..dc528e3e 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 120 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 5794bb9..d70d5ad 100644 +index 5794bb9..18d9de8 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -60,6 +60,8 @@ @@ -65,16 +65,16 @@ index 5794bb9..d70d5ad 100644 static void nm_manager_update_metered (NMManager *self) { -@@ -850,6 +879,9 @@ nm_manager_update_state (NMManager *manager) - - nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); +@@ -848,6 +877,9 @@ nm_manager_update_state (NMManager *manager) + else + new_state = find_best_device_state (manager); + if (new_state != NM_STATE_CONNECTED_GLOBAL) + new_state = find_unmanaged_state (manager, new_state); + + nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); + if (new_state == NM_STATE_CONNECTED_SITE) { - nm_connectivity_check_async (priv->connectivity, - checked_connectivity, @@ -4587,6 +4619,65 @@ impl_manager_check_connectivity (NMManager *self, } |