bootloader/grub2: Don't do anything if we have static configs #3205
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
This builds on top of coreos/bootupd@fa9924e (But in a very hacky way because we don't currently link to a JSON library) Basically, bootupd supports injecting static configs, and this is the currently least hacky way for us to detect this and understand that we shouldn't try to run `grub2-mkconfig`. A further patch I'd like to do here is also change the probing logic to gracefully no-op if `grub2-mkconfig` doesn't exist, but that has a bit more risk and involvement.
travier
added a commit
to travier/ostree
that referenced
this pull request
Sep 13, 2024
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
added a commit
to travier/ostree
that referenced
this pull request
Sep 13, 2024
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
added a commit
to travier/ostree
that referenced
this pull request
Sep 13, 2024
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
added a commit
to travier/ostree
that referenced
this pull request
Sep 13, 2024
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
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.
This builds on top of coreos/bootupd@fa9924e (But in a very hacky way because we don't currently link to a JSON library)
Basically, bootupd supports injecting static configs, and this is the currently least hacky way for us to detect this and understand that we shouldn't try to run
grub2-mkconfig.A further patch I'd like to do here is also change the probing logic to gracefully no-op if
grub2-mkconfigdoesn't exist, but that has a bit more risk and involvement.