github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 06:48:51 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Empty block-rootfs Storage.options and align with Go runtime

Browse Source 
- Set guest Storage.options for block rootfs to empty (do not propagate host mount options).
- Align behavior with Go runtime: only add xfs nouuid when needed.

Signed-off-by: Caspian443 <scrisis843@gmail.com>
This commit is contained in:
Caspian443
2025-08-26 01:27:21 +00:00
parent 9a7aadaaca
commit 617af4cb3b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/runtime-rs/crates/resource/src/rootfs/block_rootfs.rs
View File

@@ -19,6 +19,7 @@ use hypervisor::{
use kata_types::config::hypervisor::{ use kata_types::config::hypervisor::{
VIRTIO_BLK_CCW, VIRTIO_BLK_MMIO, VIRTIO_BLK_PCI, VIRTIO_PMEM, VIRTIO_SCSI, VIRTIO_BLK_CCW, VIRTIO_BLK_MMIO, VIRTIO_BLK_PCI, VIRTIO_PMEM, VIRTIO_SCSI,
}; };
use kata_types::fs::VM_ROOTFS_FILESYSTEM_XFS;
use kata_types::mount::Mount; use kata_types::mount::Mount;
use nix::sys::stat::{self, SFlag}; use nix::sys::stat::{self, SFlag};
use oci_spec::runtime as oci; use oci_spec::runtime as oci;
@@ -67,10 +68,17 @@ impl BlockRootfs {
let mut storage = Storage { let mut storage = Storage {
fs_type: rootfs.fs_type.clone(), fs_type: rootfs.fs_type.clone(),
mount_point: container_path.clone(), mount_point: container_path.clone(),
options: rootfs.options.clone(), options: vec![],
..Default::default() ..Default::default()
}; };
// XFS rootfs: add 'nouuid' to avoid UUID conflicts when the same
// disk image is mounted across multiple VMs/containers.
// This allows mounting XFS volumes that share the same UUID.
if rootfs.fs_type == VM_ROOTFS_FILESYSTEM_XFS {
storage.options.push("nouuid".to_string());
}
let mut device_id: String = "".to_owned(); let mut device_id: String = "".to_owned();
if let DeviceType::Block(device) = device_info { if let DeviceType::Block(device) = device_info {
storage.driver = device.config.driver_option; storage.driver = device.config.driver_option;