Allow supplying a disk image for PXE live systems

Fixes that the combination of command line arguments
"--make-ostree-live" and "--disk-image" lead to a program error.
This commit is contained in:
Friedrich Schöller 2016-08-01 00:31:09 +02:00 committed by Brian C. Lane
parent e61223d486
commit c60338464b

View File

@ -1448,7 +1448,7 @@ def main():
elif opts.make_pxe_live: elif opts.make_pxe_live:
work_dir = tempfile.mkdtemp(prefix="lmc-work-") work_dir = tempfile.mkdtemp(prefix="lmc-work-")
log.info("working dir is %s", work_dir) log.info("working dir is %s", work_dir)
disk_img = opts.fs_image or disk_img disk_img = opts.fs_image or opts.disk_image or disk_img
log.debug("disk image is %s", disk_img) log.debug("disk image is %s", disk_img)
result_dir = make_live_images(opts, work_dir, disk_img) result_dir = make_live_images(opts, work_dir, disk_img)