merge this shit

This commit is contained in:
nikstur 2022-11-25 18:10:21 +01:00
commit 53c4e03619
2 changed files with 4 additions and 1 deletions

View File

@ -70,6 +70,7 @@ 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,
@ -77,7 +78,8 @@ 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)
) )
} }

View File

@ -15,6 +15,7 @@ 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<()> {