image-info: update for new "partition" option in mounts.Mount
In the osbuild PR#1501 [0] a new paramter "partition" for mounts.Mount() was added. This commit updates the code that it deals cleanly with the new and the old API for `mount.Mount`. [0] https://github.com/osbuild/osbuild/pull/1501
This commit is contained in:
parent
421273d1e0
commit
973a8cf285
1 changed files with 14 additions and 6 deletions
|
|
@ -2685,12 +2685,20 @@ def append_partitions(report, image):
|
|||
jsonschema.validate(options, info.get_schema()["properties"]["options"])
|
||||
|
||||
# Finally mount
|
||||
mmgr.mount(mounts.Mount(
|
||||
part_device,
|
||||
info,
|
||||
devices_map[part_device], # retrieves the associated Device Object
|
||||
part_mountpoint,
|
||||
options))
|
||||
mnt_kwargs = {
|
||||
"name": part_device,
|
||||
"info": info,
|
||||
# retrieves the associated Device Object
|
||||
"device": devices_map[part_device],
|
||||
"target": part_mountpoint,
|
||||
"options": options
|
||||
}
|
||||
# XXX: remove inspect and just add "partition" above
|
||||
# once osbuild PR#1501 is available everywhere
|
||||
import inspect
|
||||
if "partition" in inspect.getfullargspec(mounts.Mount).args:
|
||||
mnt_kwargs["partition"] = None
|
||||
mmgr.mount(mounts.Mount(**mnt_kwargs))
|
||||
|
||||
if not root_tree:
|
||||
raise RuntimeError("The root filesystem tree is not mounted")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue