pthbs

commit ff8c53244777ea2a2653cf06a320390747779ddd
parent bc34ac0d99d72a76bae3e0cb92655818e13a15ba
Author: Jan Pobříslo <ccx@te2000.cz>
Date:   Thu, 22 Feb 2024 09:28:33 +0100

Mount /tmp in sandbox, fix typo

Diffstat:
M
command/pthbs-build
 | 
4
+++-
M
userns_sandbox.py
 | 
2
+-

2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/command/pthbs-build b/command/pthbs-build
@@ -148,9 +148,11 @@ function at_filehash(hash_type, file_hash, dst,    dstdir){
 			sandbox_cmd=sandbox_cmd" --vars="q(ENVIRON["basedir"]"/vars.yaml")
 			sandbox_cmd=sandbox_cmd" --extra-mount=tmpfs:"q(ENVIRON["basedir"]"/work")
 			sandbox_cmd=sandbox_cmd" --extra-mount=ro_bind:"q(ENVIRON["basedir"]"/packages:"ENVIRON["basedir"]"/packages")
-			sandbox_cmd=sandbox_cmd" --extra-mount=rw_bind:"q(ENVIRON["workdir"])":"q(ENVIRON["workdir"])
+			sandbox_cmd=sandbox_cmd" --extra-mount=rw_bind:"q(ENVIRON["workdir"]":"ENVIRON["workdir"])
+			sandbox_cmd=sandbox_cmd" --extra-mount=rw_bind:"q(ENVIRON["workdir"]"/.tmp:/tmp")
 			sandbox_cmd=sandbox_cmd" -- "q(ENVIRON["basedir"]"/work/root")
 			sandbox_cmd=sandbox_cmd" "q(basename(ENVIRON["envdir"]))
+			printf "%s\n" "mkdir -p "q(ENVIRON["workdir"]"/.tmp")
 		}
 	} else {
 		sandbox_cmd=""
diff --git a/userns_sandbox.py b/userns_sandbox.py
@@ -368,7 +368,7 @@ def sandbox_run(settings, command):
             '/dev',
             settings.root / 'dev',
             None,
-            (MountFlag.BIND | MountFlag.NOSUID | MountFlags.REC),
+            (MountFlag.BIND | MountFlag.NOSUID | MountFlag.REC),
         )
 
     mountpoints = [