[release-1.5 backport] libct: Enforce nr_inodes=2 to fix Focal mount errors#5355
Open
lifubang wants to merge 2 commits into
Open
[release-1.5 backport] libct: Enforce nr_inodes=2 to fix Focal mount errors#5355lifubang wants to merge 2 commits into
lifubang wants to merge 2 commits into
Conversation
On most kernels `nr_inodes=1` works fine. However, Ubuntu 20.04 (Focal) with the official 5.4 kernel carries a private patch in mm/shmem.c that rejects "nr_inodes<2", so let's keep `nr_inodes=2` here! Signed-off-by: lifubang <lifubang@acmcoder.com> (cherry picked from commit 6428976) Signed-off-by: lifubang <lifubang@acmcoder.com>
We don't know whether some kernels will fail with "nr_blocks=1,nr_inodes=2", so let's fall back to the old runc behavior of mounting a tmpfs without these options. Signed-off-by: lifubang <lifubang@acmcoder.com> (cherry picked from commit 67e6a11) Signed-off-by: lifubang <lifubang@acmcoder.com>
This file contains hidden or 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
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.
Backport of #5353 to release-1.5.
Cherry-picked from commits: