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

[Alfonso Sanchez-Beato]

Do not unconfigure Wo(W)LAN devices when quitting

We actually needed the reverse of the curren logic.

Do not unconfigure Wo(W)LAN devices when quitting

We actually needed the reverse of the curren logic.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:f6a5e4a036008a6ff3ed5fec6c64c38f3c10de41
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1495/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/1254
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1403/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1682
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/868/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1495/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

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

review: Approve

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,
 	NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self);
 	gboolean unmanage = FALSE;
 
-	_LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d)",
-	       nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE));
+	_LOGD (LOGD_DEVICE, "(%s): removing device (allow_unmanage %d, managed %d, wol %d)",
+	       nm_device_get_iface (device), allow_unmanage, nm_device_get_managed (device, FALSE),
+	       device_is_wake_on_lan (device));
 
 	if (allow_unmanage && nm_device_get_managed (device, FALSE)) {
 		NMActRequest *req = nm_device_get_act_request (device);
@@ -854,8 +855,8 @@ remove_device (NMManager *self,
 		 */
 		if (!quitting)  /* Forced removal; device already gone */
 			unmanage = TRUE;
-		else if (device_is_wake_on_lan (device))
-			unmanage = TRUE;
+		else if (device_is_wake_on_lan (device)) /* Leave configured if wo(w)lan and quitting */
+			unmanage = FALSE;
 		else if (!nm_device_can_assume_active_connection (device))
 			unmanage = TRUE;
 		else if (!req)