Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rhcos-4.8] cmdlib: support statoverride file in root of an overlay.d directory #2297

Merged
merged 1 commit into from
Jul 16, 2021
Merged

[rhcos-4.8] cmdlib: support statoverride file in root of an overlay.d directory #2297

merged 1 commit into from
Jul 16, 2021

Conversation

bgilbert
Copy link
Contributor

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 #.

This backports #2293, with a somewhat different implementation. This should be a no-op for 4.8, and will be useful for 4.9 until we switch that back to the main branch.

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 "#".
@miabbott
Copy link
Member

/retest

@bgilbert
Copy link
Contributor Author

CoreOS CI is failing because the 4.8 cosa doesn't understand Ignition spec 3.3.0 from the current fedora-coreos-config.

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sane to me!

CI is known broken on rhcos-* branches.
/override continuous-integration/jenkins/pr-merge
/override ci/prow/sanity

@openshift-ci
Copy link

openshift-ci bot commented Jul 16, 2021

@jlebon: Overrode contexts on behalf of jlebon: ci/prow/sanity, continuous-integration/jenkins/pr-merge

In response to this:

Looks sane to me!

CI is known broken on rhcos-* branches.
/override continuous-integration/jenkins/pr-merge
/override ci/prow/sanity

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
Copy link
Member

jlebon commented Jul 16, 2021

Though at least we know ShellCheck passed.

@jlebon jlebon merged commit 7f275ca into coreos:rhcos-4.8 Jul 16, 2021
@bgilbert bgilbert deleted the statoverride/rhcos-4.8 branch July 16, 2021 19:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants