[Backport release-22.05] nixos/systemd-boot: fix systemd-boot-builder dowgrade to fail #175115
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Since, 4ddc788 systemd-boot-builder is broken in two ways: * if no systemd-boot is currently installed *and* the NIXOS_INSTALL_BOOTLOADER env variable is not set, it will try to run "bootctl update", which will fail * if the currently installed systemd-boot version is newer than the version we're about to install, it will also try to run "bootctl update", which will fail This patch changes the behaviour, * for the first case to still fail, but not even bother to try running "bootctl update" and instead erroring out with an exception * for the second case to leave the newer version in place, restoring the pre - 4ddc788 behaviour To do the proper version check a new "should_update" helper function was introduced, mimicing the compare_product C function from bootctl. If the following systemd issue gets resolved, we would have a nice way to get rid of this function: > systemd/systemd#23450 This change allows to again switch to a different NixOS configuration which contains an older systemd-boot. Co-authored-by: Martin Weinelt <[email protected]> (cherry picked from commit a30de3b)
ofborg
bot
added
10.rebuild-darwin: 0
github-actions
bot
added
6.topic: nixos
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.
Bot-based backport to
release-22.05, triggered by a label in #172849.