EFI improvements for qemu-vm.nix#90280
Merged
flokli merged 8 commits intoNixOS:masterfrom Jul 6, 2020
Merged
Conversation
lheckemann
suggested changes
Jun 14, 2020
Member
lheckemann
left a comment
There was a problem hiding this comment.
Mostly LGTM, just a few small things :)
cb79895 to
8c342a5
Compare
samueldr
reviewed
Jun 14, 2020
lheckemann
approved these changes
Jun 15, 2020
9a921fb to
9437448
Compare
chkno
reviewed
Jul 3, 2020
9437448 to
a1bb16b
Compare
Member
|
This doesn't cleanly apply anymore. @danielfullmer, can you take a look? |
Without this, systemd-boot does not add an EFI boot entry for itself. The reason it worked before this fix is because it would fall back to the default installed \EFI\BOOT\BOOTX64.EFI
a1bb16b to
37bb17c
Compare
Contributor
Author
|
@flokli Rebased against master and verified the |
Member
|
This has undergone quite some review and LGTM. Thanks for the PR! |
10 tasks
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
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
The most user-visible change is that this adds support for
nixos-rebuild build-vm-with-bootloaderonaarch64-linux.Take a look at these commits in order so they make more sense. They were unfortunately not independently separable into multiple PRs, as the later commits depend on the earlier ones.
These changes also help set the foundation for testing secure boot with systemd-boot properly: #53901 (comment)
I've done the following to test, both on
x86_64-linuxandaarch64-linux:$ nix-build ./nixos/tests/systemd-boot.nixas well as:
where
test.nixis:CC @samueldr @lheckemann @flokli
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)