Merge pull request #1836 from yihuaf/yihuaf/fix-1812

Fix Errno as unresolved type.

.github/workflows/integration_tests_validation.yaml

@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   changes:

.github/workflows/main.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
   changes:

crates/libcontainer/src/process/container_main_process.rs

@@ -12,7 +12,6 @@ use nix::unistd::Pid;
 use crate::seccomp;
 #[cfg(feature = "libseccomp")]
 use nix::{
-    errno::Errno,
     sys::socket::{self, UnixAddr},
     unistd,
 };
@@ -117,15 +116,12 @@ pub fn container_main_process(container_args: &ContainerArgs) -> Result<Pid> {
             log::warn!("intermediate process killed with signal: {sig}")
         }
         Ok(_) => (),
-        Err(err) => {
+        Err(nix::errno::Errno::ECHILD) => {
             // This is safe because intermediate_process and main_process check if the process is
             // finished by piping instead of exit code.
-            if err == Errno::ECHILD {
-                log::warn!("intermediate process already reaped");
-            } else {
-                bail!("failed to wait for intermediate process: {err}");
-            }
+            log::warn!("intermediate process already reaped");
         }
+        Err(err) => bail!("failed to wait for intermediate process: {err}"),
     };
 
     Ok(init_pid)