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

mounts/ostree.deployment: rename var root -> deploy_root

Browse source 
It makes things a little more clear to know the variable is pointing
to the path of the deployment.
This commit is contained in:
Dusty Mabe 2024-01-10 00:02:38 -05:00
parent 0da68e9af5
commit e43abe1a9c
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
mounts/org.osbuild.ostree.deployment
View file

@ -105,22 +105,22 @@ class OSTreeDeploymentMount(mounts.MountService):
# - `mount(8)` # - `mount(8)`
self.bind_mount(tree, tree) self.bind_mount(tree, tree)
root = ostree.deployment_path(tree, osname, ref, serial) deploy_root = ostree.deployment_path(tree, osname, ref, serial)
print(f"Deployment root at '{os.path.relpath(root, tree)}'") print(f"Deployment root at '{os.path.relpath(deploy_root, tree)}'")
var = os.path.join(tree, "ostree", "deploy", osname, "var") var = os.path.join(tree, "ostree", "deploy", osname, "var")
boot = os.path.join(tree, "boot") boot = os.path.join(tree, "boot")
self.mountpoint = root self.mountpoint = deploy_root
self.bind_mount(root, root) # prepare to move it later self.bind_mount(deploy_root, deploy_root) # prepare to move it later
self.bind_mount(tree, os.path.join(root, "sysroot")) self.bind_mount(tree, os.path.join(deploy_root, "sysroot"))
self.bind_mount(var, os.path.join(root, "var")) self.bind_mount(var, os.path.join(deploy_root, "var"))
self.bind_mount(boot, os.path.join(root, "boot")) self.bind_mount(boot, os.path.join(deploy_root, "boot"))
subprocess.run([ subprocess.run([
"mount", "--move", root, tree, "mount", "--move", deploy_root, tree,
], check=True) ], check=True)
self.mountpoint = tree self.mountpoint = tree