05core/dracut: enable iscsi module
#2640
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
In 9997df7 ("Move from `initramfs-args` in manifest to `dracut.conf.d` files"), we migrated FCOS to use dracut dropins rather than CLI args. One notable semantic change was that these dropins were also now inherited by RHCOS. One of the migrated directives was omitting the `iscsi` module. But RHCOS OTOH has always included the `iscsi` dracut module, using `--add iscsi`. This apparent conflict was noted in a comment and deemed safe[[1]]. And in fact, it *did* seem to work at the time, but only because there was a bug in dracut: RHCOS happened to define some `--omit` arguments as well and the bug made it so that the CLI arguments overrode the inherited `omit_dracutmodules` dropin directives rather than being added to them.[[2]] The presence of this bug meant that `--add iscsi` still worked. However, in RHEL9, the bug was fixed[[3]], which meant that we now stopped pulling in the `iscsi` module since it's listed in the set of modules to omit (`--add` arguments cannot undo earlier `--omit`/ `omit_dracutmodules` arguments). The minimal fix needed here is to stop omitting the `iscsi` module. This fixes https://issues.redhat.com/browse/OCPBUGS-19811, where some users had already taken a dep on iSCSI iBFT support for autoconfiguration. It also aligns with efforts to support root-on-iSCSI in the near future, and there's no reason to not have that work happen in FCOS too. A related larger task is to stop using `initramfs-args` in RHCOS since it's now deprecated.[[4]] [1]: coreos#1828 (comment) [2]: dracutdevs/dracut#1341 [3]: dracutdevs/dracut#1342 [4]: coreos/rpm-ostree#3834
cgwalters
approved these changes
Sep 28, 2023
|
This is all we need to backport down to 4.13 for https://issues.redhat.com/browse/OCPBUGS-19811. |
This is done in openshift/os#1376 but we don't need to/shouldn't backport that series. |
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.
In 9997df7 ("Move from
initramfs-argsin manifest todracut.conf.dfiles"), we migrated FCOS to use dracut dropins rather than CLI args. One notable semantic change was that these dropins were also now inherited by RHCOS.One of the migrated directives was omitting the
iscsimodule. But RHCOS OTOH has always included theiscsidracut module, using--add iscsi. This apparent conflict was noted in a comment and deemed safe[1]. And in fact, it did seem to work at the time, but only because there was a bug in dracut: RHCOS happened to define some--omitarguments as well and the bug made it so that the CLI arguments overrode the inheritedomit_dracutmodulesdropin directives rather than being added to them.[2]The presence of this bug meant that
--add iscsistill worked. However, in RHEL9, the bug was fixed[3], which meant that we now stopped pulling in theiscsimodule since it's listed in the set of modules to omit (--addarguments cannot undo earlier--omit/omit_dracutmodulesarguments).The minimal fix needed here is to stop omitting the
iscsimodule. This fixes https://issues.redhat.com/browse/OCPBUGS-19811, where some users had already taken a dep on iSCSI iBFT support for autoconfiguration. It also aligns with efforts to support root-on-iSCSI in the near future, and there's no reason to not have that work happen in FCOS too.A related larger task is to stop using
initramfs-argsin RHCOS since it's now deprecated.[4]