diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-06-19 17:38:12 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-06-19 17:58:37 +0200 |
| commit | e6f9a3da1d9b0e5eb09b48cc1ae0ade11fbf16f2 (patch) | |
| tree | 568a489d643d69d322f1ca0bde7aa59f54ddf019 /src/runner | |
| parent | 1fa0de5175075a841e24925f76fc472927a5308d (diff) | |
| download | rebel-e6f9a3da1d9b0e5eb09b48cc1ae0ade11fbf16f2.tar rebel-e6f9a3da1d9b0e5eb09b48cc1ae0ade11fbf16f2.zip | |
unshare: use nix types for BUILD_UID/BUILD_GID
Diffstat (limited to 'src/runner')
| -rw-r--r-- | src/runner/runc/run.rs | 11 | ||||
| -rw-r--r-- | src/runner/runc/spec.rs | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/runner/runc/run.rs b/src/runner/runc/run.rs index 09bd875..0735128 100644 --- a/src/runner/runc/run.rs +++ b/src/runner/runc/run.rs @@ -58,12 +58,7 @@ fn init_task() -> Result<(), Error> { let workdir = "build/tmp/runc/workdir"; DirBuilder::new().create(workdir)?; - unistd::chown( - workdir, - Some(unistd::Uid::from_raw(unshare::BUILD_UID)), - Some(unistd::Gid::from_raw(unshare::BUILD_GID)), - ) - .to_io_result()?; + unistd::chown(workdir, Some(unshare::BUILD_UID), Some(unshare::BUILD_GID)).to_io_result()?; Ok(()) } @@ -76,8 +71,8 @@ fn collect_output(task: TaskRef, task_def: Task) -> Result<(), io::Error> { // Temporarily switch to the user running Rebel to get the right // owner for the tar files let file = { - let _setegid = util::setegid(unistd::Gid::from_raw(unshare::BUILD_GID))?; - let _seteuid = util::seteuid(unistd::Uid::from_raw(unshare::BUILD_UID))?; + let _setegid = util::setegid(unshare::BUILD_GID)?; + let _seteuid = util::seteuid(unshare::BUILD_UID)?; File::create(output_filename(task))? }; diff --git a/src/runner/runc/spec.rs b/src/runner/runc/spec.rs index 42e748c..bc226cb 100644 --- a/src/runner/runc/spec.rs +++ b/src/runner/runc/spec.rs @@ -10,8 +10,8 @@ pub fn generate_spec(run: &str) -> runtime::Spec { "process": { "terminal": false, "user": { - "uid": unshare::BUILD_UID, - "gid": unshare::BUILD_GID + "uid": unshare::BUILD_UID.as_raw(), + "gid": unshare::BUILD_GID.as_raw(), }, "args": [ "sh", |