Merge branch 'v3' into v3-t29
# Conflicts: # host/Cargo.toml # host/src/harness/mod.rs
This commit is contained in:
@@ -258,7 +258,6 @@ pub async fn run_with_userland(path: &Path, userland: Option<&Path>) -> anyhow::
|
||||
)?;
|
||||
let services = crate::process::supervise(runtime.clone());
|
||||
let result = run_with_shared_credentials(world, Arc::new(runtime), cred).await;
|
||||
services.abort();
|
||||
let _ = services.await;
|
||||
services.shutdown().await;
|
||||
result
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user