[pull] main from containerd:main#416
Merged
Merged
Conversation
NewSnapshotter auto-appends "index=off" unless the configured mount_options already carry an index option — but the check used hasOption(..., "index", false), which compares against the literal string "index". No valid mount option ever equals "index" (it is always valued, "index=on"/"index=off"), so the append happened unconditionally whenever the kernel exposes the overlay index parameter. Mount options are last-wins in the kernel, so a user-configured "index=on" was silently overridden. Worse, configuring mount_options = ["index=on", "nfs_export=on"] (the documented way to make overlay mounts NFS-exportable) produced "index=on,nfs_export=on,index=off", which the kernel rejects with EINVAL (nfs_export=on conflicts with an explicit index=off) — breaking every snapshot mount including image unpack. Make hasOption match the key of a "key[=value]" option so callers need not care whether the option takes a value, and add a regression test. Signed-off-by: AprilNEA <github@sku.moe>
…ex-check overlay: don't override a configured index mount option
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )