cmd,dirs: fix various issues discovered by a Fedora base snap #5620
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This patch fixes the algorithm that dertermines the mount point for snaps. The old code used to work because it was looking at /etc/os-release and looking for specific ID or ID_LIKE values. With the introduction of base snaps that can have arbitrary os-release files we cannot rely on this information alone. When a process is inside a snap mount namespace that has a base snap mounted as the root filesystem then the os-release level information is not useful and must not be used anymore. Inside that environment the snaps are always mounted at /snap. On the outside of a mount namespace the current algorithm is correct, it will identify the distribution and apply any differences mandated by the distribution policy. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
bboozzoo
approved these changes
Aug 9, 2018
|
Oh, indeed! I should be able to use the hello-fedora test from the store for this. |
This patch allows snap-confine to correctly identify non-Ubuntu-based base snaps as such. This essentially allows snap-confine to care less about the distribution ID and more about the concept of "snappy" vs "classic" rootfs. Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
changed the title
chipaca
approved these changes
Aug 9, 2018
Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>
zyga
force-pushed
the
fix/inside-fedora-base
branch
from
71f39ef
to
09f7463
Compare
Codecov Report
@@ Coverage Diff @@
## master #5620 +/- ##
==========================================
+ Coverage 78.93% 78.97% +0.03%
==========================================
Files 520 520
Lines 39567 39634 +67
==========================================
+ Hits 31234 31300 +66
- Misses 5789 5790 +1
Partials 2544 2544
Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch fixes the algorithm that dertermines the mount point for snaps. The
old code used to work because it was looking at /etc/os-release and looking for
specific ID or ID_LIKE values. With the introduction of base snaps that can
have arbitrary os-release files we cannot rely on this information alone.
When a process is inside a snap mount namespace that has a base snap mounted as
the root filesystem then the os-release level information is not useful and
must not be used anymore. Inside that environment the snaps are always mounted
at /snap.
On the outside of a mount namespace the current algorithm is correct, it will
identify the distribution and apply any differences mandated by the
distribution policy.
Signed-off-by: Zygmunt Krynicki zygmunt.krynicki@canonical.com
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?