github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-21 20:08:54 +00:00
Code Issues Projects Releases Wiki Activity

runtime-rs: Merge branch 'main' into runtime-rs-merge-main-1

Browse Source 
To keep runtime-rs up to date, we will merge main into runtime-rs every
week.

Fixes: #4790
Signed-off-by: Zhongtao Hu <zhongtaohu.tim@linux.alibaba.com>
This commit is contained in:
Zhongtao Hu
2022-08-02 10:46:42 +08:00
parent 993ae24080 7503bdab6e
commit 9803393f2f
11 changed files with 134 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/agent/rustjail/src/mount.rs
View File

@@ -780,7 +780,7 @@ fn mount_from(
Path::new(&dest).parent().unwrap()
};
let _ = fs::create_dir_all(&dir).map_err(|e| {
fs::create_dir_all(&dir).map_err(|e| {
log_child!(
cfd_log,
"create dir {}: {}",

2
src/agent/src/main.rs
View File

@@ -209,7 +209,7 @@ async fn real_main() -> std::result::Result<(), Box<dyn std::error::Error>> {
if config.log_level == slog::Level::Trace {
// Redirect ttrpc log calls to slog iff full debug requested
ttrpc_log_guard = Ok(slog_stdlog::init().map_err(|e| e)?);
ttrpc_log_guard = Ok(slog_stdlog::init()?);
}
if config.tracing {