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

livemedia-creator: log more failure information

Browse Source 
This switches on the rc checking in execWithRedirect and logs the error
it raises.
This commit is contained in:
Brian C. Lane 2014-07-02 15:10:14 -07:00
parent fd4afe2530
commit 5f96701caf
1 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/sbin/livemedia-creator
View File

@ -366,9 +366,11 @@ class VirtualInstall(object):
args.append("--arch") args.append("--arch")
args.append(arch) args.append(arch)
rc = execWithRedirect("virt-install", args) log.info("Running virt-install.")
if rc: try:
raise InstallError("Problem starting virtual install") execWithRedirect("virt-install", args, raise_err=True)
except subprocess.CalledProcessError as e:
raise InstallError("Problem starting virtual install: %s" % e)
conn = libvirt.openReadOnly(None) conn = libvirt.openReadOnly(None)
dom = conn.lookupByName(self.virt_name) dom = conn.lookupByName(self.virt_name)
@ -646,35 +648,37 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
# Make sure anaconda has the right product and release # Make sure anaconda has the right product and release
os.environ["ANACONDA_PRODUCTNAME"] = opts.project os.environ["ANACONDA_PRODUCTNAME"] = opts.project
os.environ["ANACONDA_PRODUCTVERSION"] = opts.releasever os.environ["ANACONDA_PRODUCTVERSION"] = opts.releasever
rc = execWithRedirect("anaconda", args) log.info("Running anaconda.")
try:
# Move the anaconda logs over to a log directory execWithRedirect("anaconda", args, raise_err=True)
log_dir = os.path.abspath(os.path.dirname(opts.logfile)) except subprocess.CalledProcessError as e:
log_anaconda = joinpaths(log_dir, "anaconda") log.error("Running anaconda failed: %s", e)
if not os.path.isdir(log_anaconda):
os.mkdir(log_anaconda)
for l in ["anaconda.log", "ifcfg.log", "program.log", "storage.log",
"packaging.log", "yum.log"]:
if os.path.exists("/tmp/"+l):
shutil.copy2("/tmp/"+l, log_anaconda)
os.unlink("/tmp/"+l)
if opts.make_iso or opts.make_fsimage:
umount(ROOT_PATH)
else:
# If anaconda failed the disk image may still be in use by dm
execWithRedirect("anaconda-cleanup", [])
dm_name = os.path.splitext(os.path.basename(disk_img))[0]
dm_path = "/dev/mapper/"+dm_name
if os.path.exists(dm_path):
dm_detach(dm_path)
loop_detach(get_loop_name(disk_img))
if selinux_enforcing:
selinux.security_setenforce(1)
if rc:
raise InstallError("novirt_install failed") raise InstallError("novirt_install failed")
finally:
# Move the anaconda logs over to a log directory
log_dir = os.path.abspath(os.path.dirname(opts.logfile))
log_anaconda = joinpaths(log_dir, "anaconda")
if not os.path.isdir(log_anaconda):
os.mkdir(log_anaconda)
for l in ["anaconda.log", "ifcfg.log", "program.log", "storage.log",
"packaging.log", "yum.log"]:
if os.path.exists("/tmp/"+l):
shutil.copy2("/tmp/"+l, log_anaconda)
os.unlink("/tmp/"+l)
if opts.make_iso or opts.make_fsimage:
umount(ROOT_PATH)
else:
# If anaconda failed the disk image may still be in use by dm
execWithRedirect("anaconda-cleanup", [])
dm_name = os.path.splitext(os.path.basename(disk_img))[0]
dm_path = "/dev/mapper/"+dm_name
if os.path.exists(dm_path):
dm_detach(dm_path)
loop_detach(get_loop_name(disk_img))
if selinux_enforcing:
selinux.security_setenforce(1)
if opts.qcow2: if opts.qcow2:
log.info("Converting %s to qcow2", disk_img) log.info("Converting %s to qcow2", disk_img)
@ -697,7 +701,7 @@ def novirt_install(opts, disk_img, disk_size, repo_url):
shutil.rmtree(ROOT_PATH) shutil.rmtree(ROOT_PATH)
if rc: if rc:
raise InstallError("novirt_install failed") raise InstallError("novirt_install mktar failed: rc=%s" % rc)
def virt_install(opts, install_log, disk_img, disk_size): def virt_install(opts, install_log, disk_img, disk_size):