nix: fix lanzatool integration/merge mixup
This commit is contained in:
parent
dec7c06e6b
commit
c87b2a09dc
|
@ -130,8 +130,7 @@
|
|||
'';
|
||||
in {
|
||||
overlays.default = final: prev: {
|
||||
inherit lanzaboote;
|
||||
lanzatool = lanzatoolBin;
|
||||
inherit lanzatool;
|
||||
};
|
||||
|
||||
nixosModules.lanzaboote = import ./nix/lanzaboote.nix;
|
||||
|
@ -158,7 +157,7 @@
|
|||
];
|
||||
|
||||
inputsFrom = [
|
||||
lanzatool
|
||||
lanzatoolBin
|
||||
lanzaboote
|
||||
];
|
||||
};
|
||||
|
@ -188,7 +187,6 @@
|
|||
enable = true;
|
||||
enrollKeys = lib.mkDefault true;
|
||||
pkiBundle = ./pki;
|
||||
package = lanzatool;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -70,7 +70,6 @@ fn install(
|
|||
) -> Result<()> {
|
||||
let lanzaboote_stub = std::env::var("LANZABOOTE_STUB")?;
|
||||
let initrd_stub = std::env::var("LANZABOOTE_INITRD_STUB")?;
|
||||
let sbsigntool = std::env::var("SBSIGNTOOL")?;
|
||||
|
||||
install::install(
|
||||
public_key,
|
||||
|
@ -78,8 +77,7 @@ fn install(
|
|||
pki_bundle,
|
||||
auto_enroll,
|
||||
bootspec,
|
||||
Path::new(&sbsigntool),
|
||||
Path::new(&lanzaboote_stub),
|
||||
Path::new(&initrd_stub)
|
||||
Path::new(&initrd_stub),
|
||||
)
|
||||
}
|
||||
|
|
|
@ -15,7 +15,6 @@ pub fn install(
|
|||
_pki_bundle: Option<PathBuf>,
|
||||
_auto_enroll: bool,
|
||||
bootspec: &Path,
|
||||
sbsigntool: &Path,
|
||||
lanzaboote_stub: &Path,
|
||||
initrd_stub: &Path,
|
||||
) -> Result<()> {
|
||||
|
|
Loading…
Reference in New Issue