Merge branch 'main' into bump_env_logger

esrlabs · Jun 19, 2024 · 6066125 · 6066125
2 parents 30ba4f1 + 00e8f7c
commit 6066125
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/examples/inspect/Cargo.toml b/examples/inspect/Cargo.toml
@@ -7,7 +7,7 @@ license = "Apache-2.0"
 
 [dependencies]
 caps = "0.5.5"
-nix = { version = "0.28.0", default-features = false, features = [ "process", "user", "signal" ] }
+nix = { version = "0.29.0", default-features = false, features = [ "process", "user", "signal" ] }
 
 [package.metadata.npk]
 manifest = "manifest.yaml"

diff --git a/examples/test-container/Cargo.toml b/examples/test-container/Cargo.toml
@@ -9,7 +9,7 @@ license = "Apache-2.0"
 anyhow = { version = "1.0.80", features = ["backtrace"] }
 caps = "0.5.5"
 clap = { version = "4.4.18", features = ["derive"] }
-nix = { version = "0.28.0", default-features = false, features = ["process", "user"] }
+nix = { version = "0.29.0", default-features = false, features = ["process", "user"] }
 socket2 = { version = "0.5.6", features = ["all"] }
 
 [package.metadata.npk]

diff --git a/northstar-runtime/Cargo.toml b/northstar-runtime/Cargo.toml
@@ -28,7 +28,7 @@ hex = { version = "0.4.3", optional = true }
 hmac = { version = "0.12.1", features = ["reset"], optional = true }
 humanize-rs = { version = "0.1.5", optional = true }
 humantime-serde = { version = "1.1.1", optional = true }
-inotify = { version = "0.10.0", features = ["stream"], optional = true }
+inotify = { version = "0.10.2", features = ["stream"], optional = true }
 itertools = { version = "0.12.1", optional = true }
 lazy_static = { version = "1.4.0", optional = true }
 libc = { version = "0.2.155", optional = true }
@@ -37,7 +37,7 @@ memchr = "2.6.2"
 memfd = { version = "0.6.4", optional = true }
 memoffset = { version = "0.9.0", optional = true }
 nanoid = { version = "0.4.0", optional = true }
-nix = { version = "0.28.0", default-features = false, features = ["fs", "sched", "ioctl", "mount", "term", "uio", "socket", "net", "signal", "user"], optional = true }
+nix = { version = "0.29.0", default-features = false, features = ["fs", "sched", "ioctl", "mount", "term", "uio", "socket", "net", "signal", "user"], optional = true }
 pkg-version = { version = "1.0.0", optional = true }
 rand_core = { version = "0.6.4", features = ["getrandom"], optional = true }
 rlimit = { version = "0.10.1", optional = true }

diff --git a/northstar-runtime/src/runtime/cgroups.rs b/northstar-runtime/src/runtime/cgroups.rs
@@ -319,18 +319,19 @@ impl MemoryMonitor {
         // This task stops when the main loop receiver closes
         let task = {
             let stop = token.clone();
-            let mut inotify = Inotify::init().expect("Error while initializing inotify instance");
+            let inotify = Inotify::init().expect("Error while initializing inotify instance");
 
             inotify
-                .add_watch(&path, WatchMask::MODIFY)
+                .watches()
+                .add(&path, WatchMask::MODIFY)
                 .expect("failed to add file watch");
 
             task::spawn(async move {
                 debug!("Listening for v2 oom events of {}", container);
 
                 let mut buffer = [0; 1024];
                 let mut stream = inotify
-                    .event_stream(&mut buffer)
+                    .into_event_stream(&mut buffer)
                     .expect("failed to initialize inotify event stream");
 
                 'outer: loop {

diff --git a/northstar-runtime/src/runtime/ipc/framed_stream.rs b/northstar-runtime/src/runtime/ipc/framed_stream.rs
@@ -67,7 +67,7 @@ impl FramedUnixStream {
 
         let message =
             recvmsg::<SockaddrIn6>(fd, iov, control_message_buffer, FLAGS).map_err(os_err)?;
-        recv_control_msg::<T>(message.cmsgs().next(), num)
+        recv_control_msg::<T>(message.cmsgs()?.next(), num)
     }
 
     /// Into UnixStream

diff --git a/northstar-tests/Cargo.toml b/northstar-tests/Cargo.toml
@@ -16,7 +16,7 @@ lazy_static = "1.4.0"
 log = "0.4.21"
 memfd = "0.6.4"
 nanoid = "0.4.0"
-nix = { version = "0.28.0", features = ["sched"], default-features = false }
+nix = { version = "0.29.0", features = ["sched"], default-features = false }
 northstar-client = { path = "../northstar-client" }
 northstar-runtime = { path = "../northstar-runtime", features = ["api", "runtime"] }
 northstar-tests-derive = { path = "northstar-tests-derive" }

diff --git a/northstar/Cargo.toml b/northstar/Cargo.toml
@@ -13,7 +13,7 @@ rust-version.workspace = true
 anyhow = { version = "1.0.80", features = ["backtrace"] }
 clap = { version = "4.4.18", features = ["derive"] }
 log = { version = "0.4.21", features = ["std"] }
-nix = { version = "0.28.0", default-features = false, features = ["sched", "mount"] }
+nix = { version = "0.29.0", default-features = false, features = ["sched", "mount"] }
 northstar-runtime = { version = "^0.9.2-pre", path = "../northstar-runtime", features = ["runtime", "rexec"] }
 tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros", "signal"] }
 toml = "0.8.14"