runner: use rootfs passed in Task definition

With this, the rootfs hash is included in the task's input hash, so now
the hash covers all significant inputs except for the runner itself.

1 files changed, 1 insertions, 23 deletions

diff --git a/crates/runner/src/init.rs b/crates/runner/src/init.rs
index ad37cf0..ede8fd8 100644
--- a/crates/runner/src/init.rs
+++ b/crates/runner/src/init.rs
@@ -1,29 +1,8 @@
-use std::fs::File;
-
 use nix::mount::{self, MsFlags};
 
 use common::error::*;
 
-use super::{tar, util::fs};
-use crate::paths;
-
-fn prepare_rootfs(path: &str) -> Result<()> {
-	tar::unpack(File::open(paths::ROOTFS_ARCHIVE)?, path)
-		.context("Unpacking build container rootfs failed")?;
-
-	mount::mount::<_, _, str, str>(Some(path), path, None, MsFlags::MS_BIND, None)
-		.context("Failed to bind mount container rootfs")?;
-	mount::mount::<str, _, str, str>(
-		None,
-		path,
-		None,
-		MsFlags::MS_REMOUNT | MsFlags::MS_BIND | MsFlags::MS_RDONLY,
-		None,
-	)
-	.context("Failed to mount container rootfs read-only")?;
-
-	Ok(())
-}
+use crate::{paths, util::fs};
 
 fn prepare_dev(path: &str) -> Result<()> {
 	fs::mkdir(path)?;
@@ -83,7 +62,6 @@ pub fn init_runner() -> Result<()> {
 	mount::mount::<str, _, str, str>(None, paths::TMP_DIR, None, MsFlags::MS_PRIVATE, None)
 		.context("Failed to set MS_PRIVATE for build tmpdir")?;
 
-	prepare_rootfs(paths::ROOTFS_DIR)?;
 	prepare_dev(paths::DEV_DIR)?;
 
 	Ok(())