From bb012d05e5373e301e7a7139097ae1a5f22b1a26 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Tue, 20 Dec 2016 20:18:31 +0800 Subject: Refresh patches, dropping ones that are included upstream: * manager-fix-state-transition-on-resuming-from-sleep.patch * wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch --- ...Force-online-state-with-unmanaged-devices.patch | 16 +++---- ...x-state-transition-on-resuming-from-sleep.patch | 54 ---------------------- debian/patches/series | 4 +- ...-t-enable-NetworkManager-wait-online.serv.patch | 30 ++++++++++++ ...able-NetworkManager-wait-online.service-s.patch | 30 ------------ ...AccessPoint-change-after-an-AP-is-removed.patch | 35 -------------- 6 files changed, 39 insertions(+), 130 deletions(-) delete mode 100644 debian/patches/manager-fix-state-transition-on-resuming-from-sleep.patch create mode 100644 debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch delete mode 100644 debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch delete mode 100644 debian/patches/wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch (limited to 'debian') diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index d4ef920a..2a059a63 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 836ab76..4d222b6 100644 +index c3d65cd..f5b3996 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -60,6 +60,8 @@ @@ -35,7 +35,7 @@ index 836ab76..4d222b6 100644 guint timestamp_update_id; gboolean startup; -@@ -799,6 +805,29 @@ find_best_device_state (NMManager *manager) +@@ -798,6 +804,29 @@ find_best_device_state (NMManager *manager, gboolean *force_connectivity_check) return best_state; } @@ -67,15 +67,15 @@ index 836ab76..4d222b6 100644 { @@ -837,6 +866,9 @@ nm_manager_update_state (NMManager *manager) else - new_state = find_best_device_state (manager); + new_state = find_best_device_state (manager, &force_connectivity_check); + 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) { -@@ -4578,6 +4610,65 @@ impl_manager_check_connectivity (NMManager *self, + if (new_state == NM_STATE_CONNECTED_SITE || force_connectivity_check) { +@@ -4587,6 +4619,65 @@ impl_manager_check_connectivity (NMManager *self, } static void @@ -141,7 +141,7 @@ index 836ab76..4d222b6 100644 start_factory (NMDeviceFactory *factory, gpointer user_data) { nm_device_factory_start (factory); -@@ -4648,6 +4739,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -4657,6 +4748,9 @@ nm_manager_start (NMManager *self, GError **error) check_if_startup_complete (self); @@ -151,7 +151,7 @@ index 836ab76..4d222b6 100644 return TRUE; } -@@ -5616,6 +5710,22 @@ nm_manager_init (NMManager *self) +@@ -5625,6 +5719,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -174,7 +174,7 @@ index 836ab76..4d222b6 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -5850,6 +5960,16 @@ dispose (GObject *object) +@@ -5858,6 +5968,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/manager-fix-state-transition-on-resuming-from-sleep.patch b/debian/patches/manager-fix-state-transition-on-resuming-from-sleep.patch deleted file mode 100644 index b2b6b27b..00000000 --- a/debian/patches/manager-fix-state-transition-on-resuming-from-sleep.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Beniamino Galvani -Date: Wed, 16 Nov 2016 11:46:29 +0100 -Subject: manager: fix state transition on resuming from sleep - -When going to sleep, we unmanage devices setting the unmanaged flags -immediately but delaying the state transition (because we do it from -another state transition). The signal handler can be executed after -the wake and, especially, after we have already re-managed the device, -making the device unmanaged again. - -Detect such situation and force the state to UNMANAGED (which will -also clear any pending state change), so that later we manage the -device again and it will try to activate any available connection. - -Fixes: 81ea812362de2757979e2c675774fc445400c59f -(cherry picked from commit 3cc06c3db679c1ff2f61a301396393300d36adbb) ---- - src/nm-manager.c | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index 4d222b6..186411e 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -4092,16 +4092,26 @@ do_sleep_wake (NMManager *self, gboolean sleeping_changed) - - if (waking_from_suspend) { - sleep_devices_clear (self); -- /* Belatedly take down Wake-on-LAN devices; ideally we wouldn't have to do this -- * but for now it's the only way to make sure we re-check their connectivity. -- */ - for (iter = priv->devices; iter; iter = iter->next) { - NMDevice *device = iter->data; - - if (nm_device_is_software (device)) - continue; -+ -+ /* Belatedly take down Wake-on-LAN devices; ideally we wouldn't have to do this -+ * but for now it's the only way to make sure we re-check their connectivity. -+ */ - if (device_is_wake_on_lan (device)) - nm_device_set_unmanaged_by_flags (device, NM_UNMANAGED_SLEEPING, TRUE, NM_DEVICE_STATE_REASON_SLEEPING); -+ -+ /* Check if the device is unmanaged but the state transition is still pending. -+ * If so, change state now so that later we re-manage the device forcing a -+ * re-check of available connections. -+ */ -+ if ( !nm_device_get_managed (device, FALSE) -+ && nm_device_get_state (device) != NM_DEVICE_STATE_UNMANAGED) { -+ nm_device_state_changed (device, NM_DEVICE_STATE_UNMANAGED, NM_DEVICE_STATE_REASON_SLEEPING); -+ } - } - } - diff --git a/debian/patches/series b/debian/patches/series index 5c1b2a36..a29c5335 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,5 @@ Force-online-state-with-unmanaged-devices.patch Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch fix-arping-path.patch Don-t-make-NetworkManager-D-Bus-activatable.patch -systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch +systemd-Don-t-enable-NetworkManager-wait-online.serv.patch Fix-iscsiadm-path.patch -manager-fix-state-transition-on-resuming-from-sleep.patch -wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch new file mode 100644 index 00000000..c822c2d5 --- /dev/null +++ b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.serv.patch @@ -0,0 +1,30 @@ +From: Michael Biebl +Date: Sun, 29 Mar 2015 22:58:43 +0200 +Subject: systemd: Don't enable NetworkManager-wait-online.service statically + +Instead we are going to hook up the service in network-online.target +dynamically via + +[Install] +WantedBy=network-online.target + +This way the user can easily disable the service. +--- + data/Makefile.am | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/data/Makefile.am b/data/Makefile.am +index 4ab4106..bbe6b32 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -18,10 +18,6 @@ endif + + NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in + $(edit) $< >$@ +- +-install-exec-local: +- install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants +- ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants + endif + + examplesdir = $(docdir)/examples diff --git a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch b/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch deleted file mode 100644 index c822c2d5..00000000 --- a/debian/patches/systemd-Don-t-enable-NetworkManager-wait-online.service-s.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Michael Biebl -Date: Sun, 29 Mar 2015 22:58:43 +0200 -Subject: systemd: Don't enable NetworkManager-wait-online.service statically - -Instead we are going to hook up the service in network-online.target -dynamically via - -[Install] -WantedBy=network-online.target - -This way the user can easily disable the service. ---- - data/Makefile.am | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 4ab4106..bbe6b32 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -18,10 +18,6 @@ endif - - NetworkManager-dispatcher.service: NetworkManager-dispatcher.service.in - $(edit) $< >$@ -- --install-exec-local: -- install -d $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants -- ln -sf $(systemdsystemunitdir)/NetworkManager-wait-online.service $(DESTDIR)$(systemdsystemunitdir)/network-online.target.wants - endif - - examplesdir = $(docdir)/examples diff --git a/debian/patches/wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch b/debian/patches/wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch deleted file mode 100644 index 6d775908..00000000 --- a/debian/patches/wifi-notify-the-AccessPoint-change-after-an-AP-is-removed.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Lubomir Rintel -Date: Wed, 16 Nov 2016 16:22:59 +0100 -Subject: wifi: notify the AccessPoint change after an AP is removed - -Otherwise its path remains visible on D-Bus despite the object is gone, -making libnm sad and grumpy: - - libnm-WARNING **: no object known for /org/freedesktop/NetworkManager/AccessPoint/666 - -(cherry picked from commit d0c01cc79daf62b83e52eea4d6302ddc42f1f5f0) ---- - src/devices/wifi/nm-device-wifi.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c -index f97e668..32737b3 100644 ---- a/src/devices/wifi/nm-device-wifi.c -+++ b/src/devices/wifi/nm-device-wifi.c -@@ -478,7 +478,6 @@ ap_add_remove (NMDeviceWifi *self, - } - - g_signal_emit (self, signals[signum], 0, ap); -- _notify (self, PROP_ACCESS_POINTS); - - if (signum == ACCESS_POINT_REMOVED) { - g_hash_table_remove (priv->aps, nm_exported_object_get_path ((NMExportedObject *) ap)); -@@ -486,6 +485,8 @@ ap_add_remove (NMDeviceWifi *self, - g_object_unref (ap); - } - -+ _notify (self, PROP_ACCESS_POINTS); -+ - nm_device_emit_recheck_auto_activate (NM_DEVICE (self)); - if (recheck_available_connections) - nm_device_recheck_available_connections (NM_DEVICE (self)); -- cgit 1.3.0-6-gf8a5