lix-project/lix-installer
16
4
Fork 4
Code Issues 23 Code Review (Gerrit) Projects Activity

No long sleep, busy poll instead

Browse source
This commit is contained in:
Ana Hobden 2022-10-25 09:06:04 -07:00
parent 8924bf5cb7
commit b920b384d3
1 changed files with 36 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/actions/meta/darwin/create_apfs_volume.rs
View file

@ -3,16 +3,21 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
time::Duration, time::Duration,
}; };
use tokio::process::Command;
use crate::actions::base::{ use crate::actions::{base::darwin, Action, ActionDescription, ActionState, Actionable};
use crate::{
actions::base::{
darwin::{ darwin::{
BootstrapVolume, BootstrapVolumeError, CreateSyntheticObjects, CreateSyntheticObjectsError, BootstrapVolume, BootstrapVolumeError, CreateSyntheticObjects,
CreateVolume, CreateVolumeError, EnableOwnership, EnableOwnershipError, EncryptVolume, CreateSyntheticObjectsError, CreateVolume, CreateVolumeError, EnableOwnership,
EncryptVolumeError, UnmountVolume, UnmountVolumeError, EnableOwnershipError, EncryptVolume, EncryptVolumeError, UnmountVolume,
UnmountVolumeError,
}, },
CreateFile, CreateFileError, CreateOrAppendFile, CreateOrAppendFileError, CreateFile, CreateFileError, CreateOrAppendFile, CreateOrAppendFileError,
},
execute_command,
}; };
use crate::actions::{base::darwin, Action, ActionDescription, ActionState, Actionable};
const NIX_VOLUME_MOUNTD_DEST: &str = "/Library/LaunchDaemons/org.nixos.darwin-store.plist"; const NIX_VOLUME_MOUNTD_DEST: &str = "/Library/LaunchDaemons/org.nixos.darwin-store.plist";
@ -197,8 +202,23 @@ impl Actionable for CreateApfsVolume {
bootstrap_volume.execute().await?; bootstrap_volume.execute().await?;
// TODO: Check wait let mut retry_tokens: usize = 50;
tokio::time::sleep(Duration::from_millis(5000)).await; loop {
tracing::trace!(%retry_tokens, "Checking for Nix Store existence");
let status = Command::new("/usr/sbin/diskutil")
.args(["info", "/nix"])
.stderr(std::process::Stdio::null())
.stdout(std::process::Stdio::null())
.status()
.await
.map_err(Self::Error::Command)?;
if status.success() || retry_tokens == 0 {
break;
} else {
retry_tokens = retry_tokens.saturating_sub(1);
}
tokio::time::sleep(Duration::from_millis(100)).await;
}
enable_ownership.execute().await?; enable_ownership.execute().await?;
@ -295,4 +315,10 @@ pub enum CreateApfsVolumeError {
DarwinUnmountVolume(#[from] UnmountVolumeError), DarwinUnmountVolume(#[from] UnmountVolumeError),
#[error(transparent)] #[error(transparent)]
CreateOrAppendFile(#[from] CreateOrAppendFileError), CreateOrAppendFile(#[from] CreateOrAppendFileError),
#[error("Failed to execute command")]
Command(
#[source]
#[serde(serialize_with = "crate::serialize_error_to_display")]
std::io::Error,
),
} }