snappy-hwe-snaps

Merge ~morphis/snappy-hwe-snaps/+git/network-manager:f/backport-wpa-plug-to-1.2.2-10 into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:stable

  1. Git
  2. lp:~morphis/snappy-hwe-snaps/+git/network-manager
  3. f/backport-wpa-plug-to-1.2.2-10
  4. Merge into stable
Proposed by Simon Fels
Status: Merged
Approved by: Tony Espy
Approved revision: 899f86c21808675c2dc19727d9c7ffa9e561056a
Merged at revision: 83e3021e3ed03ea14c032b8afd7393b5570b3031
Proposed branch: ~morphis/snappy-hwe-snaps/+git/network-manager:f/backport-wpa-plug-to-1.2.2-10
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:stable
Diff against target: 24 lines (+5/-1)
1 file modified
snapcraft.yaml (+5/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Matteo Croce (community) Approve
Tony Espy Approve
Review via email: mp+320352@code.launchpad.net

Description of the change

Backport wpa plug to stable

This brings the wpa plug we implemented in order to allow NetworkManager to talk with the wpa-supplicant snap into stable so we can push it out as a sub release of 1.2.2-10 labeled 1.2.2-10.1

1.2.2-10.1 will only have this single change and nothing else.

To post a comment you must log in.
Revision history for this message
Tony Espy (awe) wrote :

LGTM

review: Approve
Revision history for this message
Matteo Croce (teknoraver) :
review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:899f86c21808675c2dc19727d9c7ffa9e561056a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1359/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/618
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1267/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/1250
    None: https://jenkins.canonical.com/system-enablement/job/generic-cleanup-snap/269/console

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index b809f7b..851162b 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -16,6 +16,10 @@ slots:
6
7 plugs:
8 nmcli: network-manager
9+ wpa:
10+ interface: dbus
11+ bus: system
12+ name: fi.w1.wpa_supplicant1
13
14 apps:
15 nmcli:
16@@ -27,7 +31,7 @@ apps:
17 command: bin/networkmanager
18 daemon: simple
19 slots: [service]
20- plugs: [modem-manager, ppp, network-setup-observe]
21+ plugs: [modem-manager, ppp, network-setup-observe, wpa]
22 # FIXME: This will create currently a symlink inside /snap/bin
23 # which points nowhere as the service isn't exposed as application
24 # for the user. Instead snapd needs to gain support to handle

Subscribers

People subscribed via source and target branches