unfreeze dracut, adapt for NM via systemd in initrd #1068
Merged
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
6216680 to
8fa89fb
Compare
|
/hold This needs to wait until we get teaming fixed: dracutdevs/dracut#1547 |
|
Running local kola tests I see the multipath test is failing |
cgwalters
previously approved these changes
Jun 29, 2021
Is it failing consistently or just flaky? |
jlebon
previously approved these changes
Jul 7, 2021
| @@ -30,8 +30,8 @@ Description=Copy CoreOS Firstboot Networking Config | |||
| ConditionPathExists=/usr/lib/initrd-release | |||
| DefaultDependencies=false | |||
| Before=ignition-diskful.target | |||
| Before=nm-run.service | |||
There was a problem hiding this comment.
Hmm, should we keep nm-run.service and just add nm-initrd.service? That way if nm-run.service is backported to RHEL, but not nm-initrd.service, this will still work for RHCOS.
There was a problem hiding this comment.
I highly doubt that will happen as nm-run.service was only in there for one release of dracut (053) and was replaced by the full systemd+dbus implementation because the NM team actively wants it for the next version of RHEL.
IMHO I'd rather it fail so we could consider and fix our wrong assumption.
|
This should also fix coreos/fedora-coreos-tracker#849. |
yep |
8fa89fb to
170176c
Compare
Upstream dracut updated NM to run as a systemd service (with full dbus support) in the initrd in [1]. Adapt our systemd units to handle this case. This should still work fine for RHCOS because we still have `Before=dracut-initqueue.service`, which can be dropped when everyone is on dracut 0.54+. Fixes: coreos/fedora-coreos-tracker#842
Contains upstream fixes needed to get NM running via systemd+dbus in the initramfs without issues. - dracutdevs/dracut#1547 - dracutdevs/dracut#1548 - dracutdevs/dracut#1552 Needed to get dracut unfrozen: coreos/fedora-coreos-tracker#842 (comment)
5c21919 to
cf8ec8f
Compare
|
rebased on top of latest |
…-kargs We've seen races with ignition-kargs.service, which accesses /boot rw. Let's introduce some ordering here. Need to use `Before` because otherwise we get a systemd ordering cycle. Fixes: coreos/fedora-coreos-tracker#883
…pagate-multipath-conf.service Otherwise, we'll end up racing with `initrd-cleanup.service` which wants to kill everything. It has `After=initrd.target` and we do have `Before=initrd.target`, but that's not being respected, we think because `initrd-parse-etc.service` does an explicit `systemctl start` on it. Anyway, we need to dig more into this, but for now this will unblock us.
cf8ec8f to
99ecca7
Compare
jlebon
approved these changes
Jul 9, 2021
| # We've seen races with ignition-kargs.service, which accesses /boot rw. | ||
| # Let's introduce some ordering here. Need to use `Before` because otherwise | ||
| # we get a systemd ordering cycle. https://github.com/coreos/fedora-coreos-tracker/issues/883 | ||
| Before=ignition-kargs.service |
There was a problem hiding this comment.
Hmm OK yeah that makes sense now looking at the cycle in coreos/fedora-coreos-tracker#883 (comment).
We need networking to fetch the config to apply the kargs. And this service obviously has to run before networking comes up since the whole point is network configuration.
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.
Upstream dracut updated NM to run as a systemd service
(with full dbus support) in the initrd in [1]. Adapt our
systemd units to handle this case.
This should still work fine for RHCOS because we still have
Before=dracut-initqueue.service, which can be dropped wheneveryone is on dracut 0.54+.
Fixes: coreos/fedora-coreos-tracker#842