mirror/youki
1
0
Fork 0
mirror of https://github.com/containers/youki synced 2024-09-26 22:20:57 +02:00
Code Issues

code refacotor

Browse Source
This commit is contained in:
yukang 2021-09-05 23:37:16 +08:00
parent dabc14297e
commit 7a1a20b725
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/rootfs.rs
View File

@ -253,10 +253,9 @@ fn mount_to_container(
data: &str,
label: Option<&String>,
) -> Result<()> {
let none = "".to_string();
let typ: &str = m.typ.as_ref().unwrap_or(&none);
let typ = m.typ.as_deref();
let d = if let Some(l) = label {
if typ != "proc" && typ != "sysfs" {
if typ != Some("proc") && typ != Some("sysfs") {
if data.is_empty() {
format!("context=\"{}\"", l)
} else {
@ -275,7 +274,7 @@ fn mount_to_container(
);
let dest = Path::new(&dest_for_host);
let source = m.source.as_ref().context("no source in mount spec")?;
let src = if typ == "bind" {
let src = if typ == Some("bind") {
let src = canonicalize(source)?;
let dir = if src.is_file() {
Path::new(&dest).parent().unwrap()
@ -298,11 +297,11 @@ fn mount_to_container(
PathBuf::from(source)
};
if let Err(errno) = nix_mount(Some(&*src), dest, Some(typ), flags, Some(&*d)) {
if let Err(errno) = nix_mount(Some(&*src), dest, typ, flags, Some(&*d)) {
if !matches!(errno, Errno::EINVAL) {
bail!("mount of {:?} failed", m.destination);
}
nix_mount(Some(&*src), dest, Some(typ), flags, Some(data))?;
nix_mount(Some(&*src), dest, typ, flags, Some(data))?;
}
if flags.contains(MsFlags::MS_BIND)