snappy-hwe-snaps

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

  1. Git
  2. lp:~teknoraver/snappy-hwe-snaps/+git/network-manager
  3. network-manager/xenial/1.2.2
  4. Merge into network-manager/xenial/1.2.2
Proposed by Matteo Croce
Status: Merged
Approved by: Simon Fels
Approved revision: 250b7f37ba677429c311bd2db6054c9c82f6f3b5
Merged at revision: 58031e09bdc7cb9d2e128a11c12afd0cd7efeb31
Proposed branch: ~teknoraver/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2
Diff against target: 39 lines (+8/-6)
1 file modified
src/nm-manager.c (+8/-6)
Reviewer Review Type Date Requested Status
Simon Fels Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+319421@code.launchpad.net

Description of the change

Don't shutdown the wifi interface on exit

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:250b7f37ba677429c311bd2db6054c9c82f6f3b5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1254/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/323/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1170/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/984/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/7

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:250b7f37ba677429c311bd2db6054c9c82f6f3b5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1327/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/516/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1235/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1156/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/173/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

FAILED: Continuous integration, rev:250b7f37ba677429c311bd2db6054c9c82f6f3b5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1336/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/525/console
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1245/console
    FAILURE: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1162/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/183

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

review: Needs Fixing (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:250b7f37ba677429c311bd2db6054c9c82f6f3b5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1345/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/544
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1253/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1179
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/199

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

review: Approve (continuous-integration)
Revision history for this message
Simon Fels (morphis) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/nm-manager.c b/src/nm-manager.c
2index e64c68a..6b1c5f6 100644
3--- a/src/nm-manager.c
4+++ b/src/nm-manager.c
5@@ -826,6 +826,12 @@ settings_startup_complete_changed (NMSettings *settings,
6 check_if_startup_complete (self);
7 }
8
9+static gboolean
10+device_is_wake_on_lan (NMDevice *device)
11+{
12+ return nm_platform_link_get_wake_on_lan (NM_PLATFORM_GET, nm_device_get_ip_ifindex (device));
13+}
14+
15 static void
16 remove_device (NMManager *self,
17 NMDevice *device,
18@@ -848,6 +854,8 @@ remove_device (NMManager *self,
19 */
20 if (!quitting) /* Forced removal; device already gone */
21 unmanage = TRUE;
22+ else if (device_is_wake_on_lan (device))
23+ unmanage = TRUE;
24 else if (!nm_device_can_assume_active_connection (device))
25 unmanage = TRUE;
26 else if (!req)
27@@ -3843,12 +3851,6 @@ done:
28 g_clear_object (&subject);
29 }
30
31-static gboolean
32-device_is_wake_on_lan (NMDevice *device)
33-{
34- return nm_platform_link_get_wake_on_lan (NM_PLATFORM_GET, nm_device_get_ip_ifindex (device));
35-}
36-
37 static void
38 do_sleep_wake (NMManager *self, gboolean sleeping_changed)
39 {

Subscribers

People subscribed via source and target branches