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

container: implement controlling terminal takeover

Browse Source
This commit is contained in:
Alex Zenla 2024-02-11 16:39:44 +00:00
parent dbfc07b026
commit 982536513a
No known key found for this signature in database
GPG Key ID: 067B238899B51269
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
container/src/init.rs
View File

@ -3,11 +3,10 @@ use futures::stream::TryStreamExt;
use hypha::{LaunchInfo, LaunchNetwork}; use hypha::{LaunchInfo, LaunchNetwork};
use ipnetwork::IpNetwork; use ipnetwork::IpNetwork;
use log::{trace, warn}; use log::{trace, warn};
use nix::libc::{c_int, dup2, wait}; use nix::libc::{c_int, dup2, ioctl, wait};
use nix::unistd::{execve, fork, ForkResult, Pid}; use nix::unistd::{execve, fork, ForkResult, Pid};
use oci_spec::image::{Config, ImageConfiguration}; use oci_spec::image::{Config, ImageConfiguration};
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::fs;
use std::fs::{File, OpenOptions, Permissions}; use std::fs::{File, OpenOptions, Permissions};
use std::net::{Ipv4Addr, Ipv6Addr}; use std::net::{Ipv4Addr, Ipv6Addr};
use std::os::fd::AsRawFd; use std::os::fd::AsRawFd;
@ -18,6 +17,7 @@ use std::ptr::addr_of_mut;
use std::str::FromStr; use std::str::FromStr;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration; use std::time::Duration;
use std::{fs, io};
use sys_mount::{FilesystemType, Mount, MountFlags}; use sys_mount::{FilesystemType, Mount, MountFlags};
use walkdir::WalkDir; use walkdir::WalkDir;
@ -66,9 +66,9 @@ impl ContainerInit {
.write(true) .write(true)
.open("/dev/console") .open("/dev/console")
{ {
Ok(console) => self.map_console(console)?, Ok(console) => self.map_console(&console)?,
Err(error) => warn!("failed to open console: {}", error), Err(error) => warn!("failed to open console: {}", error),
} };
self.mount_squashfs_images()?; self.mount_squashfs_images()?;
let config = self.parse_image_config()?; let config = self.parse_image_config()?;
@ -133,14 +133,13 @@ impl ContainerInit {
Ok(()) Ok(())
} }
fn map_console(&mut self, console: File) -> Result<()> { fn map_console(&mut self, console: &File) -> Result<()> {
trace!("mapping console"); trace!("mapping console");
unsafe { unsafe {
dup2(console.as_raw_fd(), 0); dup2(console.as_raw_fd(), 0);
dup2(console.as_raw_fd(), 1); dup2(console.as_raw_fd(), 1);
dup2(console.as_raw_fd(), 2); dup2(console.as_raw_fd(), 2);
} }
drop(console);
Ok(()) Ok(())
} }
@ -388,6 +387,7 @@ impl ContainerInit {
Some(value) => value.clone(), Some(value) => value.clone(),
}; };
env.push("HYPHA_CONTAINER=1".to_string()); env.push("HYPHA_CONTAINER=1".to_string());
env.push("TERM=vt100".to_string());
if let Some(extra_env) = &launch.env { if let Some(extra_env) = &launch.env {
env.extend_from_slice(extra_env.as_slice()); env.extend_from_slice(extra_env.as_slice());
} }
@ -424,6 +424,11 @@ impl ContainerInit {
match unsafe { fork()? } { match unsafe { fork()? } {
ForkResult::Parent { child } => self.background(child), ForkResult::Parent { child } => self.background(child),
ForkResult::Child => { ForkResult::Child => {
unsafe { nix::libc::setsid() };
let result = unsafe { ioctl(io::stdin().as_raw_fd(), nix::libc::TIOCSCTTY, 0) };
if result != 0 {
warn!("failed to set controlling terminal, result={}", result);
}
execve(path, &cmd, &env)?; execve(path, &cmd, &env)?;
Ok(()) Ok(())
} }