interfaces: fix network-manager plug #3818

Merged
merged 4 commits into from Aug 29, 2017

Conversation

Projects
None yet
6 participants
Collaborator

mvo5 commented Aug 28, 2017

Add networkManagerPermanentPlugSecComp that adds socket AF_NETLINK - KOBJECT_UEVENT to unbreak nmcli.

We should squash-merge this and then cherry-pick it for 2.27.

LGTM.

interfaces/builtin/network_manager.go
@@ -459,6 +464,11 @@ func (iface *networkManagerInterface) SecCompPermanentSlot(spec *seccomp.Specifi
return nil
}
+func (iface *networkManagerInterface) SecCompPermanentPlug(spec *seccomp.Specification, plug *interfaces.Plug) error {
@zyga

zyga Aug 28, 2017

Contributor

Permanent plug? Why not connected?

mvo5 added some commits Aug 28, 2017

zyga approved these changes Aug 28, 2017

LGTM

@mvo5 mvo5 requested a review from jdstrand Aug 28, 2017

@zyga zyga added this to the 2.27 milestone Aug 28, 2017

codecov-io commented Aug 28, 2017

Codecov Report

Merging #3818 into master will decrease coverage by 0.02%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3818      +/-   ##
==========================================
- Coverage   75.86%   75.84%   -0.03%     
==========================================
  Files         403      403              
  Lines       34835    34907      +72     
==========================================
+ Hits        26427    26474      +47     
- Misses       6535     6555      +20     
- Partials     1873     1878       +5
Impacted Files Coverage Δ
interfaces/builtin/network_manager.go 72.72% <0%> (-5.33%) ⬇️
cmd/snap/cmd_aliases.go 93.33% <0%> (-1.67%) ⬇️
daemon/api.go 72.45% <0%> (-0.18%) ⬇️
cmd/snap/cmd_snap_op.go 63.63% <0%> (-0.11%) ⬇️
overlord/snapstate/snapstate.go 80.7% <0%> (+0.04%) ⬆️
overlord/snapstate/snapmgr.go 79.33% <0%> (+0.07%) ⬆️
client/snap_op.go 79.47% <0%> (+0.27%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3aa2420...903436e. Read the comment docs.

Collaborator

mvo5 commented Aug 28, 2017

We will need to squash merge this to make the 2.27 cherry pick simpler.

@pedronis pedronis changed the title from interfaces: fix network-manger plug to interfaces: fix network-manager plug Aug 28, 2017

@zyga zyga merged commit ac6b754 into snapcore:master Aug 29, 2017

5 of 7 checks passed

xenial-ppc64el autopkgtest finished (failure)
Details
yakkety-amd64 autopkgtest finished (failure)
Details
artful-amd64 autopkgtest finished (success)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
xenial-amd64 autopkgtest finished (success)
Details
xenial-i386 autopkgtest finished (success)
Details
zesty-amd64 autopkgtest finished (success)
Details
Contributor

jdstrand commented Aug 29, 2017

LGTM, +1

mvo5 added a commit that referenced this pull request Aug 29, 2017

interfaces: fix network-manager plug (#3818)
Add networkManagerPermanentPlugSecComp that adds socket AF_NETLINK - KOBJECT_UEVENT to unbreak nmcli

@niemeyer niemeyer removed the request for review from jdstrand Aug 31, 2017

Contributor

niemeyer commented Aug 31, 2017

@jdstrand Sending the +1 and the change requests (or even relevant comments) with the actual review feature of GH makes your review tracked both in the summary at the right above, and also in our review board.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment