github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-26 03:29:02 +00:00
Code Issues Projects Releases Wiki Activity

CCv0: Fix bad merge

Browse Source 
I seem to have lost the image_rpc `use` statement in the merge
so re-add back in

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2022-02-14 17:22:38 +00:00
parent 7159a35d20
commit 8cc68970ed
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/agent/src/config.rs
View File

@ -973,6 +973,11 @@ mod tests {
assert_eq!(d.container_pipe_size, config.container_pipe_size, "{}", msg); assert_eq!(d.container_pipe_size, config.container_pipe_size, "{}", msg);
assert_eq!(d.server_addr, config.server_addr, "{}", msg); assert_eq!(d.server_addr, config.server_addr, "{}", msg);
assert_eq!(d.tracing, config.tracing, "{}", msg); assert_eq!(d.tracing, config.tracing, "{}", msg);
assert_eq!(
d.container_policy_path, config.container_policy_path,
"{}",
msg
);
for v in vars_to_unset { for v in vars_to_unset {
env::remove_var(v); env::remove_var(v);

1
src/agent/src/rpc.rs
View File

@ -46,6 +46,7 @@ use rustjail::process::ProcessOperations;
use crate::device::{ use crate::device::{
add_devices, get_virtio_blk_pci_device_name, update_device_cgroup, update_env_pci, add_devices, get_virtio_blk_pci_device_name, update_device_cgroup, update_env_pci,
}; };
use crate::image_rpc;
use crate::linux_abi::*; use crate::linux_abi::*;
use crate::metrics::get_metrics; use crate::metrics::get_metrics;
use crate::mount::{add_storages, baremount, remove_mounts, STORAGE_HANDLER_LIST}; use crate::mount::{add_storages, baremount, remove_mounts, STORAGE_HANDLER_LIST};