Merge pull request #32 from OSInside/make_sure_proc_mountpoint_exists

Make sure system mount point exists for sci
OSInside · Jan 15, 2024 · 8f64b99 · 8f64b99
2 parents 2d3336c + cc75b6b
commit 8f64b99
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/firecracker-pilot/guestvm-tools/sci/src/defaults.rs b/firecracker-pilot/guestvm-tools/sci/src/defaults.rs
@@ -33,7 +33,6 @@ pub const PROBE_MODULE: &str = "/sbin/modprobe";
 pub const SYSTEMD_NETWORK_RESOLV_CONF: &str = "/run/systemd/resolve/resolv.conf";
 pub const VM_QUIT: &str = "sci_quit";
 pub const VHOST_TRANSPORT: &str = "vmw_vsock_virtio_transport";
-pub const SOCAT: &str = "/usr/bin/socat";
 pub const VM_PORT: u32 = 52;
 pub const GUEST_CID: u32 = 3;
 

diff --git a/firecracker-pilot/guestvm-tools/sci/src/main.rs b/firecracker-pilot/guestvm-tools/sci/src/main.rs
@@ -160,7 +160,7 @@ fn main() {
                             defaults::OVERLAY_UPPER, defaults::OVERLAY_WORK
                         )
                     )
-                    .mount("overlay", "/overlayroot/rootfs")
+                    .mount("overlay", defaults::OVERLAY_ROOT)
                 {
                     Ok(_) => {
                         debug(&format!(

diff --git a/firecracker-pilot/src/main.rs b/firecracker-pilot/src/main.rs
@@ -47,9 +47,6 @@ fn main() -> ExitCode {
 
     let result = run();
 
-    // TODO: implement cleanup function 
-    // cleanup()
-
     match result {
         Ok(()) => ExitCode::SUCCESS,
         Err(err) => {
@@ -60,7 +57,6 @@ fn main() -> ExitCode {
 }
 
 fn run() -> Result<(), FlakeError> {
-
     let program_path = app_path::program_abs_path();
     let program_name = app_path::basename(&program_path);
 

diff --git a/flake-ctl/src/firecracker.rs b/flake-ctl/src/firecracker.rs
@@ -171,9 +171,25 @@ pub async fn pull_component_image(
                 let sci_in_image = format!(
                     "{}/{}", tmp_dir_path, "/usr/sbin/sci"
                 );
+                // required for overlay mount process
                 let overlay_root_in_image = format!(
                     "{}/{}", tmp_dir_path, "/overlayroot"
                 );
+                // required for /proc/sys/kernel/sysrq based force_reboot
+                let proc_in_image = format!(
+                    "{}/{}", tmp_dir_path, "/proc"
+                );
+                // required for pivot
+                let sys_in_image = format!(
+                    "{}/{}", tmp_dir_path, "/sys"
+                );
+                let dev_in_image = format!(
+                    "{}/{}", tmp_dir_path, "/dev"
+                );
+                // required for PTS allocation
+                let dev_pts_in_image = format!(
+                    "{}/{}", tmp_dir_path, "/dev/pts"
+                );
                 if ! Path::new(&sci_in_image).exists() {
                     info!("Copying sci to rootfs...");
                     if ! copy(
@@ -187,6 +203,22 @@ pub async fn pull_component_image(
                     umount(&tmp_dir_path, "root");
                     return result
                 }
+                if ! Path::new(&proc_in_image).exists() && ! mkdir(&proc_in_image, "root") {
+                    umount(&tmp_dir_path, "root");
+                    return result
+                }
+                if ! Path::new(&sys_in_image).exists() && ! mkdir(&sys_in_image, "root") {
+                    umount(&tmp_dir_path, "root");
+                    return result
+                }
+                if ! Path::new(&dev_in_image).exists() && ! mkdir(&dev_in_image, "root") {
+                    umount(&tmp_dir_path, "root");
+                    return result
+                }
+                if ! Path::new(&dev_pts_in_image).exists() && ! mkdir(&dev_pts_in_image, "root") {
+                    umount(&tmp_dir_path, "root");
+                    return result
+                }
                 umount(&tmp_dir_path, "root");
             }