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

Merge pull request #253 from JulienMalka/initrd-message 

add more helpful message in case of append_initrd_secrets script failure
This commit is contained in:
nikstur 2023-12-27 21:29:02 +00:00 committed by GitHub
parent f707a9be9f f06680ea68
commit 7229dd85f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rust/tool/systemd/src/install.rs
View File

@ -223,7 +223,7 @@ impl Installer {
) )
.context("Failed to copy the initrd to the temporary directory.")?; .context("Failed to copy the initrd to the temporary directory.")?;
if let Some(initrd_secrets_script) = &bootspec.initrd_secrets { if let Some(initrd_secrets_script) = &bootspec.initrd_secrets {
append_initrd_secrets(initrd_secrets_script, &initrd_location)?; append_initrd_secrets(initrd_secrets_script, &initrd_location, generation.version)?;
} }
let initrd_target = self let initrd_target = self
.install_nixos_ca(&initrd_location, &format!("initrd-{}", kernel_version)) .install_nixos_ca(&initrd_location, &format!("initrd-{}", kernel_version))
@ -438,6 +438,7 @@ fn force_install(from: &Path, to: &Path) -> Result<()> {
pub fn append_initrd_secrets( pub fn append_initrd_secrets(
append_initrd_secrets_path: &Path, append_initrd_secrets_path: &Path,
initrd_path: &PathBuf, initrd_path: &PathBuf,
generation_version: u64,
) -> Result<()> { ) -> Result<()> {
let status = Command::new(append_initrd_secrets_path) let status = Command::new(append_initrd_secrets_path)
.args(vec![initrd_path]) .args(vec![initrd_path])
@ -445,8 +446,9 @@ pub fn append_initrd_secrets(
.context("Failed to append initrd secrets")?; .context("Failed to append initrd secrets")?;
if !status.success() { if !status.success() {
return Err(anyhow::anyhow!( return Err(anyhow::anyhow!(
"Failed to append initrd secrets with args `{:?}`", "Failed to append initrd secrets for generation {} with args `{:?}`",
vec![append_initrd_secrets_path, initrd_path] generation_version,
vec![append_initrd_secrets_path, initrd_path],
)); ));
} }