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

Merge pull request #4671 from liubin/4670-upgrade-nix

Browse Source 
kata-sys-util: upgrade nix version
This commit is contained in:
Bin Liu
2022-07-18 23:31:07 +08:00
committed by GitHub
parent 25be4d00fd 996a6b80bc
commit 758cc47b32
12 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime-rs/Cargo.lock generated
View File

@@ -294,7 +294,7 @@ dependencies = [
"kata-sys-util",
"kata-types",
"lazy_static",
"nix 0.23.1",
"nix 0.24.1",
"oci",
"protobuf",
"serde_json",
@@ -1035,7 +1035,7 @@ dependencies = [
"kata-types",
"libc",
"logging",
"nix 0.16.1",
"nix 0.24.1",
"seccompiler",
"serde_json",
"slog",
@@ -1151,7 +1151,7 @@ dependencies = [
"kata-types",
"lazy_static",
"libc",
"nix 0.23.1",
"nix 0.24.1",
"oci",
"once_cell",
"rand 0.7.3",
@@ -1460,6 +1460,7 @@ dependencies = [
"bitflags",
"cfg-if 1.0.0",
"libc",
"memoffset",
]
[[package]]
@@ -2027,7 +2028,7 @@ dependencies = [
"logging",
"netlink-packet-route",
"netlink-sys",
"nix 0.16.1",
"nix 0.24.1",
"oci",
"rand 0.7.3",
"rtnetlink",
@@ -2259,7 +2260,7 @@ dependencies = [
"libc",
"log",
"logging",
"nix 0.23.1",
"nix 0.24.1",
"oci",
"protobuf",
"rand 0.8.5",

2
src/runtime-rs/crates/hypervisor/Cargo.toml
View File

@@ -12,7 +12,7 @@ async-trait = "0.1.48"
dbs-utils = "0.1.0"
go-flag = "0.1.0"
libc = ">=0.2.39"
nix = "0.16.1"
nix = "0.24.1"
seccompiler = "0.2.0"
serde_json = ">=1.0.9"
slog = "2.5.2"

2
src/runtime-rs/crates/resource/Cargo.toml
View File

@@ -14,7 +14,7 @@ lazy_static = "1.4.0"
libc = ">=0.2.39"
netlink-sys = "0.8.3"
netlink-packet-route = "0.12.0"
nix = "0.16.0"
nix = "0.24.1"
rand = "^0.7.2"
rtnetlink = "0.10.0"
scopeguard = "1.0.0"

2
src/runtime-rs/crates/resource/src/share_fs/share_virtio_fs_standalone.rs
View File

@@ -128,7 +128,7 @@ impl ShareVirtioFsStandalone {
info!(sl!(), "shutdown virtiofsd pid {}", pid);
let pid = ::nix::unistd::Pid::from_raw(pid as i32);
if let Err(err) = ::nix::sys::signal::kill(pid, nix::sys::signal::SIGKILL) {
if err != ::nix::Error::Sys(nix::errno::Errno::ESRCH) {
if err != ::nix::Error::ESRCH {
return Err(anyhow!("failed to kill virtiofsd pid {} {}", pid, err));
}
}

2
src/runtime-rs/crates/runtimes/common/Cargo.toml
View File

@@ -11,7 +11,7 @@ anyhow = "^1.0"
async-trait = "0.1.48"
containerd-shim-protos = { version = "0.2.0", features = ["async"]}
lazy_static = "1.4.0"
nix = "0.23.1"
nix = "0.24.1"
protobuf = "2.27.0"
serde_json = "1.0.39"
slog = "2.5.2"

2
src/runtime-rs/crates/shim/Cargo.toml
View File

@@ -19,7 +19,7 @@ containerd-shim-protos = { version = "0.2.0", features = ["async"]}
go-flag = "0.1.0"
libc = "0.2.108"
log = "0.4.14"
nix = "0.23.1"
nix = "0.24.1"
protobuf = "2.27.0"
sha2 = "=0.9.3"
slog = {version = "2.5.2", features = ["std", "release_max_level_trace", "max_level_trace"]}