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

nix: fix lanzatool integration/merge mixup

This commit is contained in:
Julian Stecklina 2022-11-25 23:42:34 +01:00
parent dec7c06e6b
commit c87b2a09dc
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@ -130,8 +130,7 @@
''; '';
in { in {
overlays.default = final: prev: { overlays.default = final: prev: {
inherit lanzaboote; inherit lanzatool;
lanzatool = lanzatoolBin;
}; };
nixosModules.lanzaboote = import ./nix/lanzaboote.nix; nixosModules.lanzaboote = import ./nix/lanzaboote.nix;
@ -158,7 +157,7 @@
]; ];
inputsFrom = [ inputsFrom = [
lanzatool lanzatoolBin
lanzaboote lanzaboote
]; ];
}; };
@ -188,7 +187,6 @@
enable = true; enable = true;
enrollKeys = lib.mkDefault true; enrollKeys = lib.mkDefault true;
pkiBundle = ./pki; pkiBundle = ./pki;
package = lanzatool;
}; };
}; };
}; };

4
rust/lanzatool/src/cli.rs
View File

@ -70,7 +70,6 @@ fn install(
) -> Result<()> { ) -> Result<()> {
let lanzaboote_stub = std::env::var("LANZABOOTE_STUB")?; let lanzaboote_stub = std::env::var("LANZABOOTE_STUB")?;
let initrd_stub = std::env::var("LANZABOOTE_INITRD_STUB")?; let initrd_stub = std::env::var("LANZABOOTE_INITRD_STUB")?;
let sbsigntool = std::env::var("SBSIGNTOOL")?;
install::install( install::install(
public_key, public_key,
@ -78,8 +77,7 @@ fn install(
pki_bundle, pki_bundle,
auto_enroll, auto_enroll,
bootspec, bootspec,
Path::new(&sbsigntool),
Path::new(&lanzaboote_stub), Path::new(&lanzaboote_stub),
Path::new(&initrd_stub) Path::new(&initrd_stub),
) )
} }

1
rust/lanzatool/src/install.rs
View File

@ -15,7 +15,6 @@ pub fn install(
_pki_bundle: Option<PathBuf>, _pki_bundle: Option<PathBuf>,
_auto_enroll: bool, _auto_enroll: bool,
bootspec: &Path, bootspec: &Path,
sbsigntool: &Path,
lanzaboote_stub: &Path, lanzaboote_stub: &Path,
initrd_stub: &Path, initrd_stub: &Path,
) -> Result<()> { ) -> Result<()> {