From 3b1f169a195eba5969b4456f5a500e025c98e0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=B3=E5=85=89=E5=B0=91=E5=B9=B4?= <849317537@qq.com> Date: Thu, 8 Aug 2024 03:42:33 +0000 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index af4bf8e..d7d401a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,4 @@ -use std::{io, fs, fmt, os, path}; +use std::{io, fs, fmt, os, path, process}; use io::Read; use fmt::Display; use os::fd::{AsFd, AsRawFd}; @@ -89,7 +89,7 @@ fn extend_image(image_name: &String) -> Result { let volume_path_str = volume_path.to_str().unwrap(); // 安全的unwrap // 解压缩 - let out = std::process::Command::new("tar") + let out = process::Command::new("tar") .arg("-xvf") .arg(image_path_str) .arg("-C") @@ -125,7 +125,7 @@ fn init_container_overlay>(volume_path: P, upper_path: P, merged_ let dirs = format!("lowerdir={lower_dir},upperdir={upper_dir},workdir={merged_dir}"); println!("dirs: {dirs:?}"); - let out = std::process::Command::new("mount") + let out = process::Command::new("mount") .arg("-t") .arg("overlay") .arg("overlay") @@ -166,7 +166,7 @@ fn init_container_custom_volume>(container_merged_path: P, custom create_dir(&container_path, true)?; // 绑定 - let out = std::process::Command::new("mount") + let out = process::Command::new("mount") .arg("-o") .arg("bind") .arg(host_path) @@ -368,7 +368,7 @@ fn run_container(_container_id: &String, cmd: &String, args: &RockerArgs, volume init_container_user(rocker_uid, rocker_gid).unwrap(); let cmd_vec = cmd.split(" ").collect::>(); - let err = std::process::Command::new(cmd_vec[0]) + let err = process::Command::new(cmd_vec[0]) .args(&cmd_vec[1..]) .exec(); println!("execv {cmd_vec:?}失败: {err:?}"); @@ -399,7 +399,7 @@ fn run_container(_container_id: &String, cmd: &String, args: &RockerArgs, volume init_container_user(rocker_uid, rocker_gid).unwrap(); let cmd_vec = cmd.split(" ").collect::>(); - let err = std::process::Command::new(cmd_vec[0]) + let err = process::Command::new(cmd_vec[0]) .args(&cmd_vec[1..]) .exec(); println!("execv {cmd_vec:?}失败: {err:?}");