github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 13:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5105 from liubin/fix/5104-ignore-virtiofs-daemon-for-inline-mode

Browse Source 
kata-types: don't check virtio_fs_daemon for inline-virtio-fs
This commit is contained in:
Bin Liu
2022-09-13 10:33:56 +08:00
committed by GitHub
parent 42d4da9b6c fc9c6f87a3
commit a58feba9bb
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libs/kata-types/src/config/hypervisor/mod.rs
View File

@@ -818,11 +818,15 @@ impl SharedFsInfo {
validate_path_pattern(&self.valid_virtio_fs_daemon_paths, path)
}
fn adjust_virtio_fs(&mut self, _inline: bool) -> Result<()> {
resolve_path!(
self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}"
)?;
fn adjust_virtio_fs(&mut self, inline: bool) -> Result<()> {
// inline mode doesn't need external virtiofsd daemon
if !inline {
resolve_path!(
self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}"
)?;
}
if self.virtio_fs_cache.is_empty() {
self.virtio_fs_cache = default::DEFAULT_VIRTIO_FS_CACHE_MODE.to_string();
}
@@ -836,16 +840,13 @@ impl SharedFsInfo {
}
fn validate_virtio_fs(&self, inline: bool) -> Result<()> {
if inline && !self.virtio_fs_daemon.is_empty() {
return Err(eother!(
"Executable path for inline-virtio-fs is not empty: {}",
&self.virtio_fs_daemon
));
// inline mode doesn't need external virtiofsd daemon
if !inline {
validate_path!(
self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}"
)?;
}
validate_path!(
self.virtio_fs_daemon,
"Virtio-fs daemon path {} is invalid: {}"
)?;
let l = ["none", "auto", "always"];