From 83acd6cec77751e389787ee9f135dd9f26887509 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Fri, 20 Nov 2015 14:47:41 -0800 Subject: [PATCH] livemedia-creator: Correctly handle not mounting image mktar may not be run if the mount failed, this is also an error so just set rc=1 --- src/sbin/livemedia-creator | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index dd2aa1b5..614f4193 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -843,6 +843,8 @@ def virt_install(opts, install_log, disk_img, disk_size): with PartitionMount(diskimg_path) as img_mount: if img_mount and img_mount.mount_dir: rc = mktar(img_mount.mount_dir, disk_img, opts.compression, compress_args) + else: + rc = 1 os.unlink(diskimg_path) if rc: @@ -859,6 +861,8 @@ def virt_install(opts, install_log, disk_img, disk_size): shutil.copy2(opts.oci_config, img_mount.temp_dir) shutil.copy2(opts.oci_runtime, img_mount.temp_dir) rc = mktar(img_mount.temp_dir, disk_img, opts.compression, compress_args) + else: + rc = 1 os.unlink(diskimg_path) if rc: