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.

Sign up for GitHub

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

Jump to bottom

[rhcos-4.18] 07fix-selinux-labels: fix service ordering #3273

Merged
merged 1 commit into from
Nov 21, 2024
Merged

[rhcos-4.18] 07fix-selinux-labels: fix service ordering #3273

merged 1 commit into from
Nov 21, 2024

Conversation

mike-nguyen
Copy link
Member

@mike-nguyen mike-nguyen commented Nov 21, 2024 •
edited
Loading

This fixes a mistake in b182027. Before/After directives need to go in the [Unit] section, not [Service].

(cherry picked from commit e2c37db)

Backporting this to the rhcos-4.18 branch per openshift/os#1644 (comment)

@dustymabe @mike-nguyen
07fix-selinux-labels: fix service ordering
e551346 
This fixes a mistake in b182027. Before/After directives need to
go in the [Unit] section, not [Service].

(cherry picked from commit e2c37db)
@dustymabe
Copy link
Member

since zincati doesn't run in RHCOS not sure this will make much of a difference, but will maybe get rid of a warning/log message.

dustymabe
dustymabe approved these changes Nov 21, 2024
View reviewed changes
Copy link
Member

@dustymabe dustymabe left a comment

Choose a reason for hiding this comment

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

/lgtm

@dustymabe dustymabe enabled auto-merge (rebase) November 21, 2024 17:44
jlebon
jlebon approved these changes Nov 21, 2024
View reviewed changes
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.

Yeah, this is mostly to ensure there's no warning.

@jlebon
Copy link
Member

jlebon commented Nov 21, 2024

Hmm, CI isn't meaningful here. Let's just get this in?

@jlebon jlebon disabled auto-merge November 21, 2024 18:46
@jlebon jlebon merged commit 80fb4f7 into coreos:testing-devel Nov 21, 2024
2 of 3 checks passed
@jlebon
Copy link
Member

jlebon commented Nov 22, 2024

Wait, I think something got messed up. This is opened against testing-devel not rhcos-4.18. We of course already have this commit in testing-devel, but somehow the GitHub UI made it seem like we didn't. The PR is marked as merged, but AFAICT nothing was actually pushed to testing-devel. Hmm, this is possibly by design though it would've been nice to make it clearer in the UI.

Anyway, all this to say, I think we still need a PR against rhcos-4.18 with that cherry-pick.

@dustymabe
Copy link
Member

We of course already have this commit in testing-devel, but somehow the GitHub UI made it seem like we didn't.

super weird

@mike-nguyen mike-nguyen mentioned this pull request Nov 23, 2024
Merged
@mike-nguyen
Copy link
Member Author

mike-nguyen commented Nov 23, 2024 •
edited
Loading

Opened #3276 targeting the correct branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlebon jlebon jlebon approved these changes

@dustymabe dustymabe dustymabe approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mike-nguyen @dustymabe @jlebon