cmdlib: support statoverride file in root of an overlay.d directory
#2293
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 was referenced Jul 14, 2021
|
/retest |
jlebon
approved these changes
Jul 14, 2021
src/cmdlib.sh
Outdated
| @@ -273,10 +273,22 @@ commit_overlay() { | |||
| # using ostree's --statoverride when dealing with executable files. See: | |||
| # https://github.com/ostreedev/ostree/issues/2368 | |||
| rm -rf "${TMPDIR}/overlay" && (umask 0022 && cp -r "${respath}" "${TMPDIR}/overlay") | |||
| # Apply statoverrides from a file in the root of the overlay. ostree | |||
| # doesn't support comments in statoverride files, but we do. | |||
There was a problem hiding this comment.
Ahh yeah, I think it'd make sense to support comments in that file.
If an overlay.d directory contains a file called "statoverride" at the root, pass it to ostree. This allows overlay files to have permission bits that aren't tracked by Git. statoverride files don't support comments. For convenience, filter out lines starting with "#".
|
@jlebon: Overrode contexts on behalf of jlebon: ci/prow/sanity In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
jlebon
pushed a commit
to coreos/fedora-coreos-config
that referenced
this pull request
Jul 15, 2021
This is a no-op, but helps document the functionality. Part of coreos/coreos-assembler#2293.
This was referenced Jul 29, 2021
HuijingHei
pushed a commit
to HuijingHei/fedora-coreos-config
that referenced
this pull request
Oct 10, 2023
This is a no-op, but helps document the functionality. Part of coreos/coreos-assembler#2293.
HuijingHei
pushed a commit
to HuijingHei/fedora-coreos-config
that referenced
this pull request
Oct 10, 2023
This is a no-op, but helps document the functionality. Part of coreos/coreos-assembler#2293.
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.
If an
overlay.ddirectory contains a file calledstatoverrideat the root, pass it to ostree. This allows overlay files to have permission bits that aren't tracked by Git.statoverridefiles don't support comments. For convenience, filter out lines starting with#.