iso: Extract volume id with xorriso if available
Pungi can use either genisoimage or xorriso to create ISOs. It also needed isoinfo utility for querying volume ID from the ISO image. However, the utility is part of the genisoimage suite of tools. On systems that no longer provide genisoimage, the image would be successfully generate with xorriso, but then pungi would fail to extract the volume id leading to metadata with missing values. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
parent
5c9e79f535
commit
bc0334cc09
6 changed files with 54 additions and 15 deletions
|
|
@ -521,7 +521,10 @@ def link_boot_iso(compose, arch, variant, can_fail):
|
|||
setattr(img, "can_fail", can_fail)
|
||||
setattr(img, "deliverable", "buildinstall")
|
||||
try:
|
||||
img.volume_id = iso.get_volume_id(new_boot_iso_path)
|
||||
img.volume_id = iso.get_volume_id(
|
||||
new_boot_iso_path,
|
||||
compose.conf.get("createiso_use_xorrisofs"),
|
||||
)
|
||||
except RuntimeError:
|
||||
pass
|
||||
compose.im.add(variant.uid, arch, img)
|
||||
|
|
|
|||
|
|
@ -524,7 +524,10 @@ def add_iso_to_metadata(
|
|||
setattr(img, "can_fail", compose.can_fail(variant, arch, "iso"))
|
||||
setattr(img, "deliverable", "iso")
|
||||
try:
|
||||
img.volume_id = iso.get_volume_id(iso_path)
|
||||
img.volume_id = iso.get_volume_id(
|
||||
iso_path,
|
||||
compose.conf.get("createiso_use_xorrisofs"),
|
||||
)
|
||||
except RuntimeError:
|
||||
pass
|
||||
if arch == "src":
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue