Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-wowlan into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2

Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Simon Fels
Approved revision: f6a5e4a036008a6ff3ed5fec6c64c38f3c10de41
Merged at revision: bdd5c3d6cb38d248ccd8f4c76e834339f7a43e58
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-wowlan
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Diff against target: 27 lines (+5/-4)
1 file modified
src/nm-manager.c (+5/-4)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+323046@code.launchpad.net

Commit message

Do not unconfigure Wo(W)LAN devices when quitting

We actually needed the reverse of the curren logic.

Description of the change

Do not unconfigure Wo(W)LAN devices when quitting

We actually needed the reverse of the curren logic.

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM, given that we will add a spread test for this to master.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 6b1c5f6..4b6f30d 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -841,8 +841,9 @@ remove_device (NMManager *self,
841 NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);841 NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
842 gboolean unmanage = FALSE;842 gboolean unmanage = FALSE;
843843
844 _LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d)",844 _LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d, wol %d)",
845 nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE));845 nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE),
846 device_is_wake_on_lan (device));
846847
847 if (allow_unmanage && nm_device_get_managed (device, FALSE)) {848 if (allow_unmanage && nm_device_get_managed (device, FALSE)) {
848 NMActRequest *req = nm_device_get_act_request (device);849 NMActRequest *req = nm_device_get_act_request (device);
@@ -854,8 +855,8 @@ remove_device (NMManager *self,
854 */855 */
855 if (!quitting) /* Forced removal; device already gone */856 if (!quitting) /* Forced removal; device already gone */
856 unmanage = TRUE;857 unmanage = TRUE;
857 else if (device_is_wake_on_lan (device))858 else if (device_is_wake_on_lan (device)) /* Leave configured if wo(w)lan and quitting */
858 unmanage = TRUE;859 unmanage = FALSE;
859 else if (!nm_device_can_assume_active_connection (device))860 else if (!nm_device_can_assume_active_connection (device))
860 unmanage = TRUE;861 unmanage = TRUE;
861 else if (!req)862 else if (!req)

Subscribers

People subscribed via source and target branches