particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild: ensure /var/tmp is a real directory

Browse source 
This is a followup for https://github.com/osbuild/osbuild/pull/1649

Instead of symlinking /var/tmp to /tmp which may be on a tmpfs
this commit puts it on a real filesystem.

This should fix:
https://github.com/osbuild/bootc-image-builder/issues/285
This commit is contained in:
Michael Vogt 2024-03-20 13:39:24 +01:00 • committed by Ondřej Budai
parent 0528ccc3f0
commit 345516e867
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
osbuild/buildroot.py
View file

@ -138,12 +138,6 @@ class BuildRoot(contextlib.AbstractContextManager):
self.var = os.path.join(self.tmp, "var") self.var = os.path.join(self.tmp, "var")
os.makedirs(self.var, exist_ok=True) os.makedirs(self.var, exist_ok=True)
# Ensure /var/tmp is available, see
# https://github.com/osbuild/bootc-image-builder/issues/223
try:
os.symlink("/tmp", os.path.join(self.var, "tmp"))
except FileExistsError:
pass
proc = os.path.join(self.tmp, "proc") proc = os.path.join(self.tmp, "proc")
os.makedirs(proc) os.makedirs(proc)
@ -227,6 +221,10 @@ class BuildRoot(contextlib.AbstractContextManager):
mounts += ["--tmpfs", "/tmp"] mounts += ["--tmpfs", "/tmp"]
mounts += ["--bind", self.var, "/var"] mounts += ["--bind", self.var, "/var"]
# Create a usable /var/tmp, see
# https://github.com/osbuild/bootc-image-builder/issues/223
os.makedirs(os.path.join(self.var, "tmp"), 0o1777, exist_ok=True)
# Setup API file-systems. # Setup API file-systems.
mounts += ["--proc", "/proc"] mounts += ["--proc", "/proc"]
mounts += ["--ro-bind", "/sys", "/sys"] mounts += ["--ro-bind", "/sys", "/sys"]

5
test/mod/test_buildroot.py
View file

@ -50,10 +50,9 @@ def test_basic(tempdir, runner):
assert r.returncode != 0 assert r.returncode != 0
# Test that fs setup looks correct # Test that fs setup looks correct
r = root.run(["readlink", "-f", "/var/tmp"], monitor) r = root.run(["test", "-d", "/var/tmp"], monitor)
assert r.returncode == 0 assert r.returncode == 0
assert r.stdout.strip().split("\n")[-1] == "/tmp" r = root.run(["stat", "--format=%a", "/var/tmp"], monitor)
r = root.run(["stat", "-L", "--format=%a", "/var/tmp"], monitor)
assert r.returncode == 0 assert r.returncode == 0
assert r.stdout.strip().split("\n")[-1] == "1777" assert r.stdout.strip().split("\n")[-1] == "1777"