Graham/fh 463 determinatepkg failed to mount nix store (#1326)

DeterminateSystems · Nov 29, 2024 · da73477 · da73477
1 parent be8878d
commit da73477
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 15 deletions.
diff --git a/src/action/macos/create_determinate_nix_volume.rs b/src/action/macos/create_determinate_nix_volume.rs
@@ -337,10 +337,8 @@ impl Action for CreateDeterminateNixVolume {
                 "Not reverting encrypt_volume step (which would delete the disk encryption \
                 password) because deleting the volume failed"
             );
-        } else {
-            if let Err(err) = self.encrypt_volume.try_revert().await {
-                errors.push(err);
-            }
+        } else if let Err(err) = self.encrypt_volume.try_revert().await {
+            errors.push(err);
         }
 
         // Purposefully not reversed

diff --git a/src/action/macos/create_nix_volume.rs b/src/action/macos/create_nix_volume.rs
@@ -310,10 +310,8 @@ impl Action for CreateNixVolume {
                     "Not reverting encrypt_volume step (which would delete the disk encryption \
                     password) because deleting the volume failed"
                 );
-            } else {
-                if let Err(err) = encrypt_volume.try_revert().await {
-                    errors.push(err);
-                }
+            } else if let Err(err) = encrypt_volume.try_revert().await {
+                errors.push(err);
             }
         }
 

diff --git a/src/action/macos/encrypt_apfs_volume.rs b/src/action/macos/encrypt_apfs_volume.rs
@@ -1,3 +1,5 @@
+use std::time::Duration;
+
 use crate::{
     action::{
         macos::NIX_VOLUME_MOUNTD_DEST, Action, ActionDescription, ActionError, ActionErrorKind,
@@ -171,13 +173,32 @@ impl Action for EncryptApfsVolume {
 
         let disk_str = &self.disk.to_str().expect("Could not turn disk into string"); /* Should not reasonably ever fail */
 
-        execute_command(
-            Command::new("/usr/sbin/diskutil")
-                .arg("mount")
-                .arg(&self.name),
-        )
-        .await
-        .map_err(Self::error)?;
+        let mut retry_tokens: usize = 10;
+        loop {
+            let mut command = Command::new("/usr/sbin/diskutil");
+            command.process_group(0);
+            command.args(["mount", &self.name]);
+            command.stdin(std::process::Stdio::null());
+            tracing::trace!(%retry_tokens, command = ?command.as_std(), "Waiting for volume mounting to succeed");
+
+            let output = command
+                .output()
+                .await
+                .map_err(|e| ActionErrorKind::command(&command, e))
+                .map_err(Self::error)?;
+
+            if output.status.success() {
+                break;
+            } else if retry_tokens == 0 {
+                return Err(Self::error(ActionErrorKind::command_output(
+                    &command, output,
+                )))?;
+            } else {
+                retry_tokens = retry_tokens.saturating_sub(1);
+            }
+
+            tokio::time::sleep(Duration::from_millis(500)).await;
+        }
 
         // Add the password to the user keychain so they can unlock it later.
         let mut cmd = Command::new("/usr/bin/security");