Merge pull request #699 from cgwalters/install-use-rustix

install: Use rustix instead of nix in one place
containers · Jul 17, 2024 · f00395c · f00395c
2 parents 7715531 + 723ad8c
commit f00395c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/src/install.rs b/lib/src/install.rs
@@ -775,7 +775,11 @@ pub(crate) fn exec_in_host_mountns(args: &[std::ffi::OsString]) -> Result<()> {
         .ok_or_else(|| anyhow::anyhow!("Missing command"))?;
     tracing::trace!("{cmd:?} {args:?}");
     let pid1mountns = std::fs::File::open("/proc/1/ns/mnt").context("open pid1 mountns")?;
-    nix::sched::setns(pid1mountns.as_fd(), nix::sched::CloneFlags::CLONE_NEWNS).context("setns")?;
+    rustix::thread::move_into_link_name_space(
+        pid1mountns.as_fd(),
+        Some(rustix::thread::LinkNameSpaceType::Mount),
+    )
+    .context("setns")?;
     rustix::process::chdir("/").context("chdir")?;
     // Work around supermin doing chroot() and not pivot_root
     // https://github.com/libguestfs/supermin/blob/5230e2c3cd07e82bd6431e871e239f7056bf25ad/init/init.c#L288