mirrors/krata
1
0
Fork 0
mirror of https://github.com/edera-dev/krata.git synced 2025-08-03 21:21:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

krata: fix conformance to container startup

Browse Source
This commit is contained in:
Alex Zenla
2024-03-22 23:59:02 +00:00
parent 6d6610ca2f
commit 8b57c16f0a
5 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
crates/krataguest/src/init.rs
View File

@ -106,6 +106,7 @@ impl GuestInit {
self.mount_kernel_fs("devtmpfs", "/dev", "mode=0755")?;
self.mount_kernel_fs("proc", "/proc", "")?;
self.mount_kernel_fs("sysfs", "/sys", "")?;
std::os::unix::fs::symlink("/proc/self/fd", "/dev/fd")?;
Ok(())
}
@ -391,6 +392,12 @@ impl GuestInit {
cmd = launch.run.as_ref().unwrap().clone();
}
if let Some(entrypoint) = config.entrypoint() {
for item in entrypoint.iter().rev() {
cmd.insert(0, item.to_string());
}
}
if cmd.is_empty() {
cmd.push("/bin/sh".to_string());
}
@ -433,8 +440,7 @@ impl GuestInit {
working_dir = "/".to_string();
}
std::env::set_current_dir(&working_dir)?;
self.fork_and_exec(path, cmd, env).await?;
self.fork_and_exec(working_dir, path, cmd, env).await?;
Ok(())
}
@ -485,23 +491,26 @@ impl GuestInit {
async fn fork_and_exec(
&mut self,
working_dir: String,
path: CString,
cmd: Vec<CString>,
env: Vec<CString>,
) -> Result<()> {
match unsafe { fork()? } {
ForkResult::Parent { child } => self.background(child).await,
ForkResult::Child => self.foreground(path, cmd, env).await,
ForkResult::Child => self.foreground(working_dir, path, cmd, env).await,
}
}
async fn foreground(
&mut self,
working_dir: String,
path: CString,
cmd: Vec<CString>,
env: Vec<CString>,
) -> Result<()> {
GuestInit::set_controlling_terminal()?;
std::env::set_current_dir(working_dir)?;
execve(&path, &cmd, &env)?;
Ok(())
}