dirs,interfaces: create snap-confine.d on demand when re-executing #3955

Merged
merged 2 commits into from Sep 22, 2017

Conversation

Projects
None yet
4 participants
Contributor

zyga commented Sep 22, 2017

No description provided.

zyga added some commits Sep 22, 2017

dirs: add directory variable for snap-confine.d
This directory holds locally generated policy extensions that apply to
snap-confine itself.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
interfaces/apparmor: create snap-confine.d when reexecing
The distribution package may not contain the snap-confine.d directory
but due to how apparmor_parser operates it must be present or the
for-reexec profile will not compile. This patch ensures we create the
directory on demand.

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

Fair enough.

mvo5 approved these changes Sep 22, 2017

Codecov Report

Merging #3955 into master will decrease coverage by <.01%.
The diff coverage is 25%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3955      +/-   ##
==========================================
- Coverage   75.93%   75.92%   -0.01%     
==========================================
  Files         420      420              
  Lines       36310    36314       +4     
==========================================
  Hits        27571    27571              
- Misses       6807     6810       +3     
- Partials     1932     1933       +1
Impacted Files Coverage Δ
interfaces/apparmor/backend.go 70.73% <0%> (-1.32%) ⬇️
dirs/dirs.go 98.09% <100%> (+0.01%) ⬆️
interfaces/sorting.go 98.71% <0%> (-1.29%) ⬇️

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 f6a3064...9ccdede. Read the comment docs.

@zyga zyga merged commit c2104d5 into snapcore:master Sep 22, 2017

1 of 7 checks passed

artful-amd64 autopkgtest running
Details
artful-i386 autopkgtest running
Details
xenial-amd64 autopkgtest running
Details
xenial-i386 autopkgtest running
Details
xenial-ppc64el autopkgtest running
Details
zesty-amd64 autopkgtest running
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@zyga zyga deleted the zyga:fix/create-snap-confine-dot-d branch Sep 22, 2017

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