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

util/chroot: Add support for custom directory bind mounts

Browse source 
- Add optional bind_mounts parameter to __init__ method;
 - Enhanced methods to accept an optional `bind_mounts`.
This allows for more flexible for configurations when setting
up bind mounts.

Signed-off-by: Renata Ravanelli <rravanel@redhat.com>
This commit is contained in:
Renata Ravanelli 2024-10-31 14:13:50 -03:00 • committed by Achilleas Koutsou
parent f1c43ae5bd
commit 458df8695f
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
osbuild/util/chroot.py
View file

@ -12,8 +12,9 @@ class Chroot:
This mounts /proc, /dev, and /sys. This mounts /proc, /dev, and /sys.
""" """
def __init__(self, root: str): def __init__(self, root: str, bind_mounts=None):
self.root = root self.root = root
self._bind_mounts = bind_mounts or []
def __enter__(self): def __enter__(self):
for d in ["/proc", "/dev", "/sys"]: for d in ["/proc", "/dev", "/sys"]:
@ -33,6 +34,13 @@ class Chroot:
"sysfs", f"{self.root}/sys"], "sysfs", f"{self.root}/sys"],
check=True) check=True)
for d in self._bind_mounts:
target_path = os.path.join(self.root, d.lstrip("/"))
if not os.path.exists(target_path):
print(f"Making missing chroot directory: {d}")
os.makedirs(target_path)
subprocess.run(["mount", "--rbind", d, target_path], check=True)
return self return self
def __exit__(self, exc_type, exc_value, tracebk): def __exit__(self, exc_type, exc_value, tracebk):
@ -40,6 +48,10 @@ class Chroot:
for d in ["/proc", "/dev", "/sys"]: for d in ["/proc", "/dev", "/sys"]:
if subprocess.run(["umount", "--lazy", self.root + d], check=False).returncode != 0: if subprocess.run(["umount", "--lazy", self.root + d], check=False).returncode != 0:
failed_umounts.append(d) failed_umounts.append(d)
for d in self._bind_mounts[::-1]:
target_path = os.path.join(self.root, d.lstrip("/"))
if subprocess.run(["umount", "--lazy", target_path], check=False).returncode != 0:
failed_umounts.append(d)
if failed_umounts: if failed_umounts:
print(f"Error unmounting paths from chroot: {failed_umounts}") print(f"Error unmounting paths from chroot: {failed_umounts}")