min
/
lanzaboote
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #318 from nix-community/ovmf-rejoice 

tests: remove custom OVMF overrides
This commit is contained in:
Ryan Lahfa 2024-03-01 22:26:59 +00:00 committed by GitHub
parent 614b538f0f d470342af6
commit eeb45682dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.lock
View File

@ -97,11 +97,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1708847675, "lastModified": 1709271102,
"narHash": "sha256-RUZ7KEs/a4EzRELYDGnRB6i7M1Izii3JD/LyzH0c6Tg=", "narHash": "sha256-Z2sBL/HRRTNABsU8E5XsP+FXBEyBoi6oMwm5bV7lSFw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2a34566b67bef34c551f204063faeecc444ae9da", "rev": "09c1497ce5d4ed4a0edfdd44450d3048074cb300",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
nix/tests/lanzaboote.nix
View File

@ -101,35 +101,7 @@ let
useBootLoader = true; useBootLoader = true;
useEFIBoot = true; useEFIBoot = true;
# We actually only want to enable features in OVMF, but at efi.OVMF = pkgs.OVMFFull.fd;
# the moment edk2 202308 is also broken. So we downgrade it
# here as well. How painful!
#
# See #240.
efi.OVMF =
let
edk2Version = "202305";
edk2Src = pkgs.fetchFromGitHub {
owner = "tianocore";
repo = "edk2";
rev = "edk2-stable${edk2Version}";
fetchSubmodules = true;
hash = "sha256-htOvV43Hw5K05g0SF3po69HncLyma3BtgpqYSdzRG4s=";
};
edk2 = pkgs.edk2.overrideAttrs (old: rec {
version = edk2Version;
src = edk2Src;
});
in
(pkgs.OVMF.override {
secureBoot = useSecureBoot;
tpmSupport = useTPM2; # This is needed otherwise OVMF won't initialize the TPM2 protocol.
edk2 = edk2;
}).overrideAttrs (old: {
src = edk2Src;
});
qemu.options = lib.mkIf useTPM2 [ qemu.options = lib.mkIf useTPM2 [
"-chardev socket,id=chrtpm,path=${tpmSocketPath}" "-chardev socket,id=chrtpm,path=${tpmSocketPath}"
@ -147,7 +119,7 @@ let
}; };
boot.lanzaboote = { boot.lanzaboote = {
enable = true; enable = true;
enrollKeys = lib.mkDefault true; enrollKeys = useSecureBoot;
pkiBundle = ./fixtures/uefi-keys; pkiBundle = ./fixtures/uefi-keys;
}; };
}; };