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

[1.13.x] Cherry pick "systemd fixes for udevd skipping events" #3005

Merged
merged 3 commits into from
Apr 11, 2023

Conversation

etungsten
Copy link
Contributor

Issue number:

N/A

Description of changes:
Cherry-pick commits from #2999

Testing done:
See testing description in #2999

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

bcressey and others added 3 commits April 11, 2023 12:35
The local filesystem is expected to be ready before local-fs.target
is reached.

Signed-off-by: Ben Cressey <bcressey@amazon.com>

We don't need to wait for the 'repart' units since this cause boot to
hang until the repart units timeout on waiting for a potentiaily
non-existent data partition.

'systemd-repart' and 'systemd-makefs' both lock on the block device
before operating on it, so repart is guaranteed to finish before makefs
can create the filesystem.

Co-authored-by: Erikson Tung <etung@amazon.com>
We explicitly stop and mask any repart-data service that has a start job
waiting on a non-existent data partition after 'makefs' finishes
successfully. This prevents awkward start job timeout messages from
being printed to the console.
Backports the following, with some minor edits:
 * systemd/systemd@2d40f02
 * systemd/systemd#22717
 * systemd/systemd@400e3d2
 * systemd/systemd@4f294ff
 * systemd/systemd@c02fb80

This fixes an issue with kernel uevents getting skipped by udev when the
data partition block device is locked by 'systemd-makefs' or
'systemd-repart'.
Copy link
Contributor

@stmcginnis stmcginnis left a comment

Choose a reason for hiding this comment

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

Looks good, assuming the tests pass.

@etungsten etungsten merged commit 6c3a313 into bottlerocket-os:1.13.x Apr 11, 2023
@etungsten etungsten deleted the cherry-pick-udevd branch April 11, 2023 20:15
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.

4 participants