05core: re-order and rename some dracut modules #800
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
Unlike `ln -sf`, `systemctl add-{requires,wants}` wants to verify that
the target and member units all exist. Because we had some dracut
modules which ran earlier than the `30ignition` module, we would lose
the service enablements which hook into e.g. `ignition-complete.target`
and related units.
Let's simply rename our modules so that they're ordered after
`30ignition`. While we're here, let's consistently prefix them by
`coreos-`. So overall, the changes are:
- `30ignition-coreos` -> `35coreos-ignition`
- `20live` -> `35coreos-live`
- `15coreos-network` -> `35coreos-network`
I've verified that there are now no "Failed to add dependency on unit"
error messages at build-time. (The next patch enforces this more
strictly.)
Fixes: coreos#778
Closes: coreos#799
This was referenced Jan 4, 2021
dustymabe
approved these changes
Jan 4, 2021
Because dracut directly sources `module-setup.sh` scripts and isn't
compatible with `set -e`, we can't just turn it on in our modules.
Instead, let's just manually add `|| exit 1` in all the calls to
`systemctl add-{requires,wants}` so that we catch regressions like
coreos#799 at build time
in the future.
jlebon
force-pushed
the
pr/re-order-dracut
branch
from
5cf2474
to
d914894
Compare
Having it in |
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Jan 5, 2021
Specifically, - the ESP unraiding change (coreos/fedora-coreos-config#794) - working around buggy udev (coreos/fedora-coreos-config#779) - --copy-network regression (coreos/fedora-coreos-config#800) For the latter, also apply the same `|| exit 1` change from coreos/fedora-coreos-config#800 to our own dracut modules for good measure. ``` $ git shortlog --invert-grep --author='CoreOS Bot' 6c9f15c8857772f730cdb0b5b2df143e778c5d0d..bdcebad9c07a7f90661865ef8001d07fda896922 Benjamin Gilbert (6): 40ignition-ostree: silence mkfs.xfs coreos-boot-mount-generator: stop mounting /boot/efi 40ignition-ostree: rename mount_and_restore_filesystem 40ignition-ostree: create mountpoint in mount_verbose 40ignition-ostree: add get_partlabels_for_parttype helper 40ignition-ostree: copy ESP contents as independent filesystems Dusty Mabe (1): overrides: drop graduated overrides Jonathan Lebon (7): 40ignition-ostree/transposefs: also trigger udev on by-label link mismatch for ESP 40ignition-ostree/transposefs: factor out function to restore fs 40ignition-ostree/transposefs: relabel the root of reprovisioned filesystems 40ignition-ostree/transposefs: load zram with num_devices=0 Add rawhide repo file 05core: re-order and rename some dracut modules 05core: add `|| exit 1` to `systemctl add-{requires,wants}` calls Kelvin Fan (1): overlay.d/15fcos: Stop utilizing c-l-h-m private dir Prashanth Sundararaman (1): tests: Enable TPM test for all arches except s390x Timothée Ravier (1): manifests/fedora-coreos-base: Mask systemd-repart ```
jlebon
added a commit
to jlebon/os
that referenced
this pull request
Jan 6, 2021
Specifically, - the ESP unraiding change (coreos/fedora-coreos-config#794) - working around buggy udev (coreos/fedora-coreos-config#779) - --copy-network regression (coreos/fedora-coreos-config#800) - Azure udev rules in initramfs (coreos/fedora-coreos-config#786) For the latter, also apply the same `|| exit 1` change from coreos/fedora-coreos-config#800 to our own dracut modules for good measure. ``` $ git shortlog --invert-grep --author='CoreOS Bot' 6c9f15c8857772f730cdb0b5b2df143e778c5d0d..8c07b7391473910ba3884ee0d3763743805ac78f Benjamin Gilbert (6): 40ignition-ostree: silence mkfs.xfs coreos-boot-mount-generator: stop mounting /boot/efi 40ignition-ostree: rename mount_and_restore_filesystem 40ignition-ostree: create mountpoint in mount_verbose 40ignition-ostree: add get_partlabels_for_parttype helper 40ignition-ostree: copy ESP contents as independent filesystems Dusty Mabe (1): overrides: drop graduated overrides Jonathan Lebon (7): 40ignition-ostree/transposefs: also trigger udev on by-label link mismatch for ESP 40ignition-ostree/transposefs: factor out function to restore fs 40ignition-ostree/transposefs: relabel the root of reprovisioned filesystems 40ignition-ostree/transposefs: load zram with num_devices=0 Add rawhide repo file 05core: re-order and rename some dracut modules 05core: add `|| exit 1` to `systemctl add-{requires,wants}` calls Kelvin Fan (1): overlay.d/15fcos: Stop utilizing c-l-h-m private dir Luca BRUNO (1): overrides: drop stale Afterburn entries Micah Abbott (2): use WALinuxAgent-udev package for Azure udev rules overlay: add new module for installing Azure udev rules Prashanth Sundararaman (1): tests: Enable TPM test for all arches except s390x Timothée Ravier (1): manifests/fedora-coreos-base: Mask systemd-repart ```
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.
Unlike
ln -sf,systemctl add-{requires,wants}wants to verify thatthe target and member units all exist. Because we had some dracut
modules which ran earlier than the
30ignitionmodule, we would losethe service enablements which hook into e.g.
ignition-complete.targetand related units.
Let's simply rename our modules so that they're ordered after
30ignition. While we're here, let's consistently prefix them bycoreos-. So overall, the changes are:30ignition-coreos->35coreos-ignition20live->35coreos-live15coreos-network->35coreos-networkI've verified that there are now no "Failed to add dependency on unit"
error messages at build-time. (The next patch enforces this more
strictly.)
Fixes: #778
Closes: #799