Skip to content

Commit

Permalink
Merge pull request #3980 from ikeydoherty/refix-snap-ns
Browse files Browse the repository at this point in the history
snap-confine: Ensure lib64 biarch directory is respected
  • Loading branch information
mvo5 authored Sep 28, 2017
2 parents a74b97d + aad4f90 commit f96badd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions cmd/snap-confine/snap-confine.apparmor.in
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,14 @@
# from the distribution package. This is also the location used when using
# the core/base snap on all-snap systems. The variants here represent
# various locations of libexecdir across distributions.
/usr/lib{,exec}/snapd/snap-update-ns Cxr -> snap_update_ns,
/usr/lib{,exec,64}/snapd/snap-update-ns Cxr -> snap_update_ns,

# ...snap-confine is not, conceptually, re-executing and uses
# snap-update-ns from the distribution package but we are already inside
# the constructed mount namespace so we must traverse "hostfs". The
# variants here represent various locations of libexecdir across
# distributions.
/var/lib/snapd/hostfs/usr/lib{,exec}/snapd/snap-update-ns Cxr -> snap_update_ns,
/var/lib/snapd/hostfs/usr/lib{,exec,64}/snapd/snap-update-ns Cxr -> snap_update_ns,

# ..snap-confine is, conceptually, re-executing and uses snap-update-ns
# from the core snap. Note that the location of the core snap varies from
Expand Down

0 comments on commit f96badd

Please sign in to comment.