storaged: Use kernelopt.sh to set rd.neednet=1 #20422
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
|
Uh, first time I actually see differential shellcheck fail. That's a bit awkward -- the |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
`grubby` isn't a thing on OSTree systems. We already have our `kernelopt.sh` script which supports all our distros. Move it to pkg/lib, and use it for NBDE. Fixes cockpit-project#20419
Differential ShellCheck complains about > ./pkg/lib/kernelopt.sh:67:18: warning[SC2166]: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined. That's easy enough to fix. It also complains about the `-a`, but that's awkward to split out due to the grouping. Ignore that part.
|
@sgallagher There's a packit COPR with the fix if you want to test. You can overlay the rpm on your tree? |
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.
grubbyisn't a thing on OSTree systems. We already have ourkernelopt.shscript which supports all our distros. Move it to pkg/lib, and use it for NBDE.Fixes #20419
Our current CI only tests on classic RPM, which should be a good enough regression test. Our FCOS image doesn't have the clevis* packages. I'm rather wary of adding them, as
rpm-ostree installoverlays are really not meant to be a production thing. This will/may come with -bootc images or perhaps rhel4edge. We don't currently run any cockpit-storage test there, that's a bigger project on its own.