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

(RHEL-16182) units: change assert to condition to skip running in initrd/os #241

Merged
merged 1 commit into from
Mar 1, 2024

Conversation

mrc0mmand
Copy link
Member

@mrc0mmand mrc0mmand commented Feb 29, 2024

These units are also present in the initrd, so instead of an assert, just use a condition so they are skipped where they need to be skipped.

Fixes systemd/systemd#26358

(cherry picked from commit 7ef09e2)

Related: RHEL-16182


Noticed this while testing #238. This doesn't affect RHEL 9 directly (yet), since RHEL 9's dracut doesn't pull in these files, but once that change gets backported we'd start seeing fails in journal. Since we're going to do another RHEL 9 build anyway, let's throw this one in as well.

These units are also present in the initrd, so instead of an assert,
just use a condition so they are skipped where they need to be skipped.

Fixes systemd/systemd#26358

(cherry picked from commit 7ef09e2)

Related: RHEL-16182
@github-actions github-actions bot changed the title units: change assert to condition to skip running in initrd/os (RHEL-16182) units: change assert to condition to skip running in initrd/os Feb 29, 2024
@github-actions github-actions bot added pr/needs-ci Formerly needs-ci pr/needs-review Formerly needs-review labels Feb 29, 2024
Copy link

github-actions bot commented Feb 29, 2024

Commit validation

Tracker - RHEL-16182

The following commits meet all requirements

commit upstream
169594a - units: change assert to condition to skip running in initrd/os systemd/systemd@7ef09e2

Tracker validation

Success

🟢 Tracker RHEL-16182 has set desired product: rhel-9.3.0
🟢 Tracker RHEL-16182 has set desired component: systemd
🟢 Tracker RHEL-16182 has been approved


Pull Request validation

Success

🟢 CI - All checks have passed
🟢 Review - Reviewed by a member
🟢 Approval - Changes were approved


Auto Merge

Success

🟢 Pull Request is not marked as draft and it's not blocked by dont-merge label
🟢 Pull Request meet requirements, title has correct form
🟢 Pull Request meet requirements, mergeable is true
🟢 Pull Request meet requirements, mergeable_state is clean
🟢 Pull Request has correct target branch main
🟢 Pull Request was merged

@github-actions github-actions bot removed the pr/needs-ci Formerly needs-ci label Feb 29, 2024
Copy link
Member

@dtardon dtardon left a comment

Choose a reason for hiding this comment

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

LGTM

@github-actions github-actions bot removed the pr/needs-review Formerly needs-review label Mar 1, 2024
@github-actions github-actions bot merged commit 1c4cb49 into redhat-plumbers:main Mar 1, 2024
21 checks passed
@mrc0mmand mrc0mmand deleted the assert branch March 7, 2024 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

systemd-{pcrphase,pcrphase-sysinit,pcrmachine}.service are started in initrd and fail
4 participants