github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-20 00:48:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge dc7f2e0fdb into 9379a18c8a

Browse Source
This commit is contained in:
zhaodiaoer 2025-08-12 19:43:18 +08:00 committed by GitHub
commit 4d62cc81b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/agent/rustjail/src/container.rs
View File

@ -355,13 +355,13 @@ fn do_init_child(cwfd: RawFd) -> Result<()> {
lazy_static::initialize(&NAMESPACES); lazy_static::initialize(&NAMESPACES);
lazy_static::initialize(&DEFAULT_DEVICES); lazy_static::initialize(&DEFAULT_DEVICES);
let init = std::env::var(INIT)?.eq(format!("{}", true).as_str()); let init = std::env::var(INIT)?.eq("true");
let no_pivot = std::env::var(NO_PIVOT)?.eq(format!("{}", true).as_str()); let no_pivot = std::env::var(NO_PIVOT)?.eq("true");
let crfd = std::env::var(CRFD_FD)?.parse::<i32>().unwrap(); let crfd = std::env::var(CRFD_FD)?.parse::<i32>().unwrap();
let cfd_log = std::env::var(CLOG_FD)?.parse::<i32>().unwrap(); let cfd_log = std::env::var(CLOG_FD)?.parse::<i32>().unwrap();
if std::env::var(PIDNS_ENABLED)?.eq(format!("{}", true).as_str()) { if std::env::var(PIDNS_ENABLED)?.eq("true") {
// get the pidns fd from parent, if parent had passed the pidns fd, // get the pidns fd from parent, if parent had passed the pidns fd,
// then get it and join in this pidns; otherwise, create a new pidns // then get it and join in this pidns; otherwise, create a new pidns
// by unshare from the parent pidns. // by unshare from the parent pidns.
@ -1477,15 +1477,6 @@ fn get_namespaces(linux: &Linux) -> Vec<LinuxNamespace> {
.namespaces() .namespaces()
.clone() .clone()
.unwrap_or_default() .unwrap_or_default()
.iter()
.map(|ns| {
let mut namespace = LinuxNamespace::default();
namespace.set_typ(ns.typ());
namespace.set_path(ns.path().clone());
namespace
})
.collect()
} }
pub fn setup_child_logger(fd: RawFd, child_logger: Logger) -> tokio::task::JoinHandle<()> { pub fn setup_child_logger(fd: RawFd, child_logger: Logger) -> tokio::task::JoinHandle<()> {