Resolve relative disk paths and image layout

Author: richiemcilroy

apps/admin/src/lib/provisioner.ts

@@ -124,13 +124,13 @@ export const PROVISION_STEPS: ProvisionStep[] = [
       const kernelUrl = await presignKernel()
       const rootfsUrl = await presignRootfs()
       return [
-        'mkdir -p /var/sandchest/images',
-        `curl -fsSL --retry 3 --retry-delay 5 '${kernelUrl}' -o /var/sandchest/images/vmlinux-5.10`,
-        `curl -fsSL --retry 3 --retry-delay 5 '${rootfsUrl}' -o /var/sandchest/images/rootfs.ext4`,
-        'chmod 644 /var/sandchest/images/vmlinux-5.10 /var/sandchest/images/rootfs.ext4',
+        'mkdir -p /var/sandchest/images/ubuntu-22.04-base',
+        `curl -fsSL --retry 3 --retry-delay 5 '${kernelUrl}' -o /var/sandchest/images/ubuntu-22.04-base/vmlinux`,
+        `curl -fsSL --retry 3 --retry-delay 5 '${rootfsUrl}' -o /var/sandchest/images/ubuntu-22.04-base/rootfs.ext4`,
+        'chmod 644 /var/sandchest/images/ubuntu-22.04-base/vmlinux /var/sandchest/images/ubuntu-22.04-base/rootfs.ext4',
       ]
     },
-    validate: 'test -f /var/sandchest/images/vmlinux-5.10 && test -f /var/sandchest/images/rootfs.ext4 && echo "images ok"',
+    validate: 'test -f /var/sandchest/images/ubuntu-22.04-base/vmlinux && test -f /var/sandchest/images/ubuntu-22.04-base/rootfs.ext4 && echo "images ok"',
   },
   {
     id: 'install-certs-mtls',
@@ -214,7 +214,7 @@ nft -f /etc/nftables.conf && systemctl enable nftables`,
         'RestartSec=5',
         'EnvironmentFile=-/etc/sandchest/node.env',
         'Environment=RUST_LOG=info',
-        'Environment=DATA_DIR=/var/sandchest',
+        'Environment=SANDCHEST_DATA_DIR=/var/sandchest',
         '',
         '[Install]',
         'WantedBy=multi-user.target',

crates/sandchest-node/src/disk.rs

@@ -11,23 +11,30 @@ pub async fn clone_disk(src_ext4: &str, sandbox_id: &str, data_dir: &str) -> Res
     let sandbox_dir = format!("{}/sandboxes/{}", data_dir, sandbox_id);
     let dest = format!("{}/rootfs.ext4", sandbox_dir);
 
+    // Resolve relative source paths against data_dir
+    let resolved_src = if Path::new(src_ext4).is_relative() {
+        format!("{}/{}", data_dir, src_ext4)
+    } else {
+        src_ext4.to_string()
+    };
+
     // Create sandbox directory
     tokio::fs::create_dir_all(&sandbox_dir).await.map_err(|e| {
         DiskError::Io(format!("failed to create sandbox directory {}: {}", sandbox_dir, e))
     })?;
 
-    if !Path::new(src_ext4).exists() {
-        return Err(DiskError::SourceNotFound(src_ext4.to_string()));
+    if !Path::new(&resolved_src).exists() {
+        return Err(DiskError::SourceNotFound(resolved_src));
     }
 
     info!(
-        src = %src_ext4,
+        src = %resolved_src,
         dest = %dest,
         sandbox_id = %sandbox_id,
         "cloning disk with reflink"
     );
 
-    let src = src_ext4.to_string();
+    let src = resolved_src;
     let dst = dest.clone();
 
     // Use --reflink=auto on Linux for instant CoW clones on XFS/btrfs.
@@ -62,20 +69,27 @@ pub async fn clone_disk(src_ext4: &str, sandbox_id: &str, data_dir: &str) -> Res
 ///
 /// Like `clone_disk` but allows specifying the target directory directly.
 /// The destination directory must already exist.
-pub async fn clone_disk_to(src_ext4: &str, dest_dir: &str) -> Result<String, DiskError> {
+pub async fn clone_disk_to(src_ext4: &str, dest_dir: &str, data_dir: &str) -> Result<String, DiskError> {
     let dest = format!("{}/rootfs.ext4", dest_dir);
 
-    if !Path::new(src_ext4).exists() {
-        return Err(DiskError::SourceNotFound(src_ext4.to_string()));
+    // Resolve relative source paths against data_dir
+    let resolved_src = if Path::new(src_ext4).is_relative() {
+        format!("{}/{}", data_dir, src_ext4)
+    } else {
+        src_ext4.to_string()
+    };
+
+    if !Path::new(&resolved_src).exists() {
+        return Err(DiskError::SourceNotFound(resolved_src));
     }
 
     info!(
-        src = %src_ext4,
+        src = %resolved_src,
         dest = %dest,
         "cloning disk with reflink to target directory"
     );
 
-    let src = src_ext4.to_string();
+    let src = resolved_src;
     let dst = dest.clone();
 
     let output = if cfg!(target_os = "linux") {
@@ -258,7 +272,7 @@ mod tests {
         let dest_dir = tmp.join("target");
         std::fs::create_dir_all(&dest_dir).unwrap();
 
-        let result = clone_disk_to(src_file.to_str().unwrap(), dest_dir.to_str().unwrap()).await;
+        let result = clone_disk_to(src_file.to_str().unwrap(), dest_dir.to_str().unwrap(), tmp.to_str().unwrap()).await;
         assert!(result.is_ok());
 
         let dest = result.unwrap();
@@ -274,7 +288,7 @@ mod tests {
         let tmp = std::env::temp_dir().join("sandchest-disk-to-missing");
         std::fs::create_dir_all(&tmp).unwrap();
 
-        let result = clone_disk_to("/nonexistent/rootfs.ext4", tmp.to_str().unwrap()).await;
+        let result = clone_disk_to("/nonexistent/rootfs.ext4", tmp.to_str().unwrap(), "/tmp").await;
         assert!(matches!(result.unwrap_err(), DiskError::SourceNotFound(_)));
 
         let _ = std::fs::remove_dir_all(&tmp);

crates/sandchest-node/src/sandbox.rs

@@ -203,7 +203,7 @@ impl SandboxManager {
                     return Err(SandboxError::CreateFailed(format!("chroot setup failed: {}", e)));
                 }
             }
-            match disk::clone_disk_to(rootfs_ref, &paths.dir).await {
+            match disk::clone_disk_to(rootfs_ref, &paths.dir, &self.node_config.data_dir).await {
                 Ok(path) => path,
                 Err(e) => {
                     error!(sandbox_id = %sandbox_id, error = %e, "failed to clone disk to chroot");
@@ -354,7 +354,7 @@ impl SandboxManager {
             }
         }
         let _rootfs_path = if self.node_config.jailer.enabled {
-            match disk::clone_disk_to(&snapshot_rootfs, &paths.dir).await {
+            match disk::clone_disk_to(&snapshot_rootfs, &paths.dir, &self.node_config.data_dir).await {
                 Ok(path) => path,
                 Err(e) => {
                     error!(sandbox_id = %sandbox_id, error = %e, "failed to clone snapshot disk");
@@ -687,7 +687,7 @@ impl SandboxManager {
 
         // --- Step 3: Clone disk (while source is paused for consistency) ---
         let disk_result = if self.node_config.jailer.enabled {
-            disk::clone_disk_to(&source_rootfs, &fork_sandbox_dir).await
+            disk::clone_disk_to(&source_rootfs, &fork_sandbox_dir, &self.node_config.data_dir).await
         } else {
             disk::clone_disk(&source_rootfs, new_sandbox_id, &self.node_config.data_dir).await
         };
@@ -1089,6 +1089,8 @@ impl SandboxManager {
     ) -> Result<FirecrackerVm, SandboxError> {
         let kernel_path = if kernel_ref.is_empty() {
             self.node_config.kernel_path.clone()
+        } else if std::path::Path::new(kernel_ref).is_relative() {
+            format!("{}/{}", self.node_config.data_dir, kernel_ref)
         } else {
             kernel_ref.to_string()
         };