almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Correctly handle not mounting image

Browse Source 
mktar may not be run if the mount failed, this is also an error so just
set rc=1
This commit is contained in:
Brian C. Lane 2015-11-20 14:47:41 -08:00
parent 4bc4b4c5a5
commit 83acd6cec7
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sbin/livemedia-creator
View File

@ -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: