Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

better predicate to wait on for setup flow

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-28 16:21:27 -06:00
committed by Aiden McClelland
parent 796e3300b9
commit fa7748ebf9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
appmgr/src/setup.rs
View File

@@ -47,18 +47,19 @@ pub async fn execute(
let guid = let guid =
crate::disk::main::create(&ctx.zfs_pool_name, [embassy_logicalname], DEFAULT_PASSWORD) crate::disk::main::create(&ctx.zfs_pool_name, [embassy_logicalname], DEFAULT_PASSWORD)
.await?; .await?;
let search_string = format!("id: {}", guid);
let mut ctr = 0; let mut ctr = 0;
while { while {
ctr += 1; ctr += 1;
ctr < 30 // 30s timeout ctr < 30 // 30s timeout
} && String::from_utf8( } && !String::from_utf8(
Command::new("zpool") Command::new("zpool")
.arg("import") .arg("import")
.invoke(crate::ErrorKind::Zfs) .invoke(crate::ErrorKind::Zfs)
.await?, .await?,
)? )?
.trim() .lines()
== "no pools available to import" .any(|line| line.trim() == &search_string)
{ {
tokio::time::sleep(Duration::from_secs(1)).await; tokio::time::sleep(Duration::from_secs(1)).await;
} }