Merge pull request #138 from morningtzh/fix-tmpfs

vmm: fix tmpfs bind dir empty
kuasar-io · Jul 23, 2024 · bb47ca1 · bb47ca1
2 parents 5958124 + e69ee45
commit bb47ca1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/vmm/sandbox/src/storage/mod.rs b/vmm/sandbox/src/storage/mod.rs
@@ -64,7 +64,8 @@ where
         // handle tmpfs mount
         let mount_info = get_mount_info(&m.source).await?;
         if let Some(mi) = mount_info {
-            if mi.fs_type == "tmpfs" {
+            // Only allow use tmpfs in emptyDir
+            if mi.fs_type == "tmpfs" && mi.mount_point.contains("kubernetes.io~empty-dir") {
                 self.handle_tmpfs_mount(&id, container_id, m, &mi).await?;
                 return Ok(());
             }
@@ -317,6 +318,7 @@ where
 }
 
 pub struct MountInfo {
+    pub mount_point: String,
     pub fs_type: String,
     pub options: Vec<String>,
 }
diff --git a/vmm/sandbox/src/storage/mount.rs b/vmm/sandbox/src/storage/mount.rs
@@ -47,7 +47,11 @@ pub async fn get_mount_info(mount_point: &str) -> Result<Option<MountInfo>> {
         if mp == mount_point {
             let fs_type = fields[2].to_string();
             let options = fields[3].split(',').map(|x| x.to_string()).collect();
-            return Ok(Some(MountInfo { fs_type, options }));
+            return Ok(Some(MountInfo {
+                mount_point: mp,
+                fs_type,
+                options,
+            }));
         }
     }
     Ok(None)