[release/1.7] cherry-pick: Fix ro mount option being passed#8887
Merged
fuweid merged 1 commit intocontainerd:release/1.7from Jul 30, 2023
Merged
[release/1.7] cherry-pick: Fix ro mount option being passed#8887fuweid merged 1 commit intocontainerd:release/1.7from
fuweid merged 1 commit intocontainerd:release/1.7from
Conversation
"ro" was not parsed out of the string, so it was passed as part of data to mount(). This would lead to mount() returning an invalid argument code. Separate out the "ro" option, much like "userxattr", which will allow the MS-RDONLY mountflag to get set. Signed-off-by: Ben Foster <[email protected]> (cherry picked from commit f3daf32)
dcantah
approved these changes
Jul 29, 2023
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
4 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.
Clean cherry pick of f3daf32 (#8852) into
release/1.7"ro" was not parsed out of the string, so it was passed as part of data to mount().
This would lead to mount() returning an invalid argument code. Separate out the "ro" option, much like "userxattr", which will allow the MS-RDONLY mountflag to get set.
Signed-off-by: Ben Foster [email protected]
(cherry picked from commit f3daf32)