almalinux/lorax
14
1
Fork 0
Code Issues Pull Requests Releases Activity

livemedia-creator: Handle virt-install failure cleanup

Browse Source
This commit is contained in:
Brian C. Lane 2014-05-29 16:54:49 -07:00
parent 4b86677485
commit 280f36dad7
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/sbin/livemedia-creator
View File

@ -311,7 +311,7 @@ class VirtualInstall( object ):
rc = execWithRedirect("virt-install", args) rc = execWithRedirect("virt-install", args)
if rc: if rc:
raise Exception("Problem starting virtual install") raise InstallError("Problem starting virtual install")
conn = libvirt.openReadOnly(None) conn = libvirt.openReadOnly(None)
dom = conn.lookupByName(self.virt_name) dom = conn.lookupByName(self.virt_name)
@ -625,14 +625,20 @@ def virt_install(opts, install_log, disk_img, disk_size):
if opts.proxy: if opts.proxy:
kernel_args += " proxy="+opts.proxy kernel_args += " proxy="+opts.proxy
virt = VirtualInstall(iso_mount, opts.ks, disk_img, disk_size, try:
kernel_args, opts.ram, opts.vnc, opts.arch, virt = VirtualInstall(iso_mount, opts.ks, disk_img, disk_size,
log_check = log_monitor.server.log_check, kernel_args, opts.ram, opts.vnc, opts.arch,
virtio_host = log_monitor.host, log_check = log_monitor.server.log_check,
virtio_port = log_monitor.port) virtio_host = log_monitor.host,
virt.destroy() virtio_port = log_monitor.port)
log_monitor.shutdown() virt.destroy()
iso_mount.umount() log_monitor.shutdown()
except InstallError as e:
log.error("VirtualInstall failed: %s", e)
raise
finally:
log.info("unmounting the iso")
iso_mount.umount()
if log_monitor.server.log_check(): if log_monitor.server.log_check():
raise InstallError("virt_install failed") raise InstallError("virt_install failed")
@ -682,7 +688,7 @@ def make_image(opts, ks):
virt_install(opts, install_log, disk_img, disk_size) virt_install(opts, install_log, disk_img, disk_size)
except InstallError as e: except InstallError as e:
log.error("Install failed: {0}".format(e)) log.error("Install failed: {0}".format(e))
if not opts.keep_image: if not opts.keep_image and os.path.exists(disk_img):
log.info("Removing bad disk image") log.info("Removing bad disk image")
os.unlink(disk_img) os.unlink(disk_img)
raise raise