direktil/initrd
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

seed: more atomic

Browse Source
This commit is contained in:
Mikaël Cluseau
2026-06-02 06:36:45 +02:00
parent 2924263cb6
commit e72e6a0b3b
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cmd/init/bootstrap.rs
+10 -3
View File
@@ -159,7 +159,7 @@ async fn seed_config(
let cfg_path = &format!("{base_dir}/config.yaml");
if fs::try_exists(cfg_path).await? {
return Ok(fs::read(cfg_path).await?);
return verifier.verify_path(&cfg_path).await;
}
let bs_tar = "/bootstrap.tar";
@@ -172,13 +172,20 @@ async fn seed_config(
fetch_bootstrap(bs, bs_tar).await?;
}
try_exec("tar", &["xf", bs_tar, "-C", base_dir]).await?;
let tmp_dir = &format!("{base_dir}.new");
fs::create_dir_all(tmp_dir).await?;
try_exec("tar", &["xf", bs_tar, "-C", tmp_dir]).await?;
let cfg_path = &format!("{tmp_dir}/config.yaml");
if !fs::try_exists(cfg_path).await? {
return Err(format_err!("{cfg_path} does not exist after seeding"));
}
verifier.verify_path(&cfg_path).await
let cfg_bytes = verifier.verify_path(&cfg_path).await?;
fs::rename(tmp_dir, base_dir).await?;
Ok(cfg_bytes)
}
async fn fetch_bootstrap(bs: &dkl::bootstrap::Bootstrap, output_file: &str) -> Result<()> {