bootloader/grub2: Handle empty static configs #3300
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
|
Skipping CI for Draft Pull Request. |
|
Still test / investigating if this is really the issue. |
|
CI fixes in #3301 |
cgwalters
approved these changes
Sep 13, 2024
| @@ -30,6 +30,7 @@ | |||
| #define BOOTUPD_CONFIG "boot/bootupd-state.json" | |||
| // Horrible hack, to avoid including a JSON parser we just grep for this | |||
| #define BOOTUPD_CONFIG_STATIC_JSON_FRAGMENT "\"static-configs\"" | |||
| #define BOOTUPD_CONFIG_STATIC_JSON_FRAGMENT_NULL "\"static-configs\":null" | |||
There was a problem hiding this comment.
Ouch 😢
I dunno, maybe overdue for us to link in a json library, I had just hoped to do that with rust (that's in #3054 but nontrivial)
There was a problem hiding this comment.
Yeah, I agree it's really not great :/
In ostreedev#3205, we introduced a check to skip re-generating the GRUB config if we detect that static configs are in used by looking at bootupd's state. Unfortunately this check is incomplete and does not account for present but null entries in the JSON state file. A proper fix would be to parse the JSON but this requires a larger code change. Fixes: ostreedev#3295 Fixes: ostreedev#3205
travier
force-pushed
the
main-static-config-null
branch
from
e339625 to
508a8b6
Compare
|
This is working from initial testing. |
|
Just stumbled on this bug with EL 9.4, is it already planned for backport to EL 9.4 (or 9.5) or should I open an issue/case ? |
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 #3205, we introduced a check to skip re-generating the GRUB config if we detect that static configs are in used by looking at bootupd's state.
Unfortunately this check is incomplete and does not account for present but null entries in the JSON state file.
A proper fix would be to parse the JSON but this requires a larger code change.
Fixes: #3295
Fixes: #3205