Merge pull request #336 from jprendes/bump-nix

Bump nix to 1.27.1

Cargo.toml

@@ -30,7 +30,7 @@ env_logger = "0.10"
 libc = "0.2.147"
 libcontainer = { version = "0.2", default-features = false }
 log = "0.4"
-nix = "0.26"
+nix = "0.27"
 oci-spec = { version = "0.6.1", features = ["runtime"] }
 serde = "1.0"
 serde_json = "1.0"

crates/containerd-shim-wasm/Cargo.toml

@@ -31,7 +31,7 @@ wat = { workspace = true }
 caps = "0.5"
 dbus = { version = "*", features = ["vendored"] }
 libcontainer = { workspace = true, features = ["libseccomp", "systemd", "v1", "v2"]}
-nix = { workspace = true }
+nix = { workspace = true, features = ["sched", "mount"] }
 
 [target.'cfg(windows)'.dependencies]
 windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_Storage_FileSystem"] }

crates/containerd-shim-wasm/src/sys/unix/container/instance.rs

@@ -9,6 +9,7 @@ use libcontainer::signal::Signal;
 use libcontainer::syscall::syscall::SyscallType;
 use nix::errno::Errno;
 use nix::sys::wait::{waitid, Id as WaitID, WaitPidFlag, WaitStatus};
+use nix::unistd::Pid;
 
 use crate::container::Engine;
 use crate::sandbox::instance::{ExitCode, Wait};
@@ -60,7 +61,7 @@ impl<E: Engine> SandboxInstance for Instance<E> {
             .with_systemd(false)
             .build()?;
 
-        let pid = container.pid().context("failed to get pid")?;
+        let pid = container.pid().context("failed to get pid")?.as_raw();
 
         container.start().map_err(|err| {
             SandboxError::Any(anyhow::anyhow!("failed to start container: {}", err))
@@ -70,7 +71,7 @@ impl<E: Engine> SandboxInstance for Instance<E> {
         thread::spawn(move || {
             let (lock, cvar) = &*exit_code;
 
-            let status = match waitid(WaitID::Pid(pid), WaitPidFlag::WEXITED) {
+            let status = match waitid(WaitID::Pid(Pid::from_raw(pid)), WaitPidFlag::WEXITED) {
                 Ok(WaitStatus::Exited(_, status)) => status,
                 Ok(WaitStatus::Signaled(_, sig, _)) => sig as i32,
                 Ok(_) => 0,
@@ -86,7 +87,7 @@ impl<E: Engine> SandboxInstance for Instance<E> {
             cvar.notify_all();
         });
 
-        Ok(pid.as_raw() as u32)
+        Ok(pid as u32)
     }
 
     /// Send a signal to the instance

crates/containerd-shim-wasm/src/sys/unix/networking.rs

@@ -1,5 +1,4 @@
 use std::fs::File;
-use std::os::unix::io::AsRawFd;
 
 use anyhow::Result;
 use containerd_shim::error::Error as ShimError;
@@ -25,7 +24,7 @@ pub fn setup_namespaces(spec: &runtime::Spec) -> Result<()> {
                         err
                     ))
                 })?;
-                setns(f.as_raw_fd(), CloneFlags::CLONE_NEWNET).map_err(|err| {
+                setns(f, CloneFlags::CLONE_NEWNET).map_err(|err| {
                     ShimError::Other(format!("could not set network namespace: {0}", err))
                 })?;
             } else {