nixos/systemd-boot: update bootloader if needed#90386
Merged
flokli merged 3 commits intoNixOS:masterfrom Jun 16, 2020
Merged
Conversation
78ddb79 to
10a662f
Compare
Contributor
Author
flokli
approved these changes
Jun 15, 2020
Member
flokli
left a comment
There was a problem hiding this comment.
Some small nits, but apart from that, tested and LGTM.
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
Outdated
Show resolved
Hide resolved
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
Outdated
Show resolved
Hide resolved
systemd/systemd@6cd12eb changed behaviour - now the "default" entry needs to identity an entry with its full name, including the ".conf". Reported-In: NixOS#86422
10a662f to
42b9225
Compare
Member
|
Thanks! |
10 tasks
| else: | ||
| # Update bootloader to latest if needed | ||
| systemd_version = subprocess.check_output(["@systemd@/bin/bootctl", "--version"], universal_newlines=True).split()[1] | ||
| sdboot_status = subprocess.check_output(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "status"], universal_newlines=True) |
Contributor
There was a problem hiding this comment.
This line fails on my system, because of Boot into FW: not supported, which causes the entire command to fail, when then causes check_output to throw an exception. Is that the expected behavior in this case?
Contributor
There was a problem hiding this comment.
Ignore this comment, I submitted an issue about this instead.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Motivation for this change
Fixes #86422
Messing with people's existing bootloaders is always a little scary, so I'd appreciate a careful review.
Tested with
Also tested on my own physical machine.
CC @flokli @Mic92
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)