From 40cd95dbf34463544057dcf8f7ed5db015d7151d Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Wed, 27 Nov 2019 22:50:19 +0100 Subject: [PATCH] assemblers/qemu: clarify extra_args --- assemblers/org.osbuild.qemu | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/assemblers/org.osbuild.qemu b/assemblers/org.osbuild.qemu index b39b316f..bdaf70be 100755 --- a/assemblers/org.osbuild.qemu +++ b/assemblers/org.osbuild.qemu @@ -156,16 +156,15 @@ def main(tree, output_dir, options, loop_client): with mount(loop) as mountpoint: subprocess.run(["cp", "-a", f"{tree}/.", mountpoint], check=True) - extra_args = [] + extra_args = { + "raw": [], + "qcow2": ["-c"], + "vdi": [], + "vmdk": ["-c"], + "vpc": ["-o", "subformat=fixed,force_size"] + } - # raw and vdi don't suppport compression - if fmt not in ("raw", "vdi", "vpc"): - extra_args.append("-c") - - if fmt == "vpc": - extra_args += ["-o", "subformat=fixed,force_size"] - - subprocess.run(["qemu-img", "convert", "-O", fmt, *extra_args, image, f"{output_dir}/{filename}"], check=True) + subprocess.run(["qemu-img", "convert", "-O", fmt, *extra_args[fmt], image, f"{output_dir}/{filename}"], check=True) if __name__ == '__main__':