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

osbuild/mounts: adjust the source path to use when mounting devices

Browse source 
Adjust the source path to just have /dev in front (i.e. /dev/loop0)
and not be a path to the temporary dev directory that was prepared.
We do this because some tools (like grub2-install) consult
mountinfo to try to canonicalize paths for mounts.

Fixes https://github.com/osbuild/osbuild/issues/1492
This commit is contained in:
Dusty Mabe 2023-12-12 22:58:14 -05:00
parent b830c80a3f
commit dfd59a38d9
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
osbuild/mounts.py
View file

@ -58,7 +58,18 @@ class MountManager:
def mount(self, mount: Mount) -> Dict:
# Get the absolute path to the source device inside the
# temporary filesystem (i.e. /run/osbuild/osbuild-dev-xyz/loop0)
# and also the relative path to the source device inside
# that filesystem (i.e. loop0). If the device also exists on the
# host in `/dev` (like /dev/loop0), we'll use that path for the
# mount because some tools (like grub2-install) consult mountinfo
# to try to canonicalize paths for mounts and inside the bwrap env
# the device will be under `/dev`. https://github.com/osbuild/osbuild/issues/1492
source = self.devices.device_abspath(mount.device)
relpath = self.devices.device_relpath(mount.device)
if relpath and os.path.exists(os.path.join('/dev', relpath)):
source = os.path.join('/dev', relpath)
root = os.fspath(self.root)