interfaces/builtin: fold network-bind into core-support #3166

Merged
merged 1 commit into from Apr 11, 2017

Conversation

Projects
None yet
3 participants
Contributor

zyga commented Apr 10, 2017

Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com

interfaces/builtin: fold network-bind into core-support
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
Contributor

niemeyer commented Apr 10, 2017

mvo5 approved these changes Apr 10, 2017

@@ -79,7 +79,9 @@ owner /boot/uboot/config.txt.tmp rwk,
func NewCoreSupportInterface() interfaces.Interface {
return &commonInterface{
name: "core-support",
- connectedPlugAppArmor: coreSupportConnectedPlugAppArmor,
+ // NOTE: cure-support implicitly contains the rules from network-bind.
+ connectedPlugAppArmor: coreSupportConnectedPlugAppArmor + networkBindConnectedPlugAppArmor,
@mvo5

mvo5 Apr 10, 2017

Collaborator

Nice!

mvo5 added a commit to snapcore/core that referenced this pull request Apr 10, 2017

Collaborator

mvo5 commented Apr 10, 2017

The corresponding core snap change: snapcore/core#33 - then we need to adjust the test in #3164 and we are good to go with 2.24

@mvo5 mvo5 added this to the 2.24 milestone Apr 10, 2017

@mvo5 mvo5 merged commit e2a856c into snapcore:master Apr 11, 2017

6 checks passed

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

@zyga zyga deleted the zyga:fold-network-bind-into-core-support branch Aug 22, 2017

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