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

livemedia-creator: Simplify cleanup for no-virt

Browse Source 
If an anaconda no-virt run crashes it can leave things mounted under
/mnt/sysimage. Previously anaconda-cleanup was used to handle this, but
it will also try to cleanup host mountpoints which isn't desired.
This commit is contained in:
Brian C. Lane 2016-04-05 09:59:29 -07:00
parent 701ab02619
commit bae111d5a3
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sbin/livemedia-creator
View File

@ -672,6 +672,23 @@ def novirt_log_check(log_check, proc):
return False return False
def anaconda_cleanup(dirinstall_path):
"""
Cleanup any leftover mounts from anaconda
:param str dirinstall_path: Path where anaconda mounts things
If anaconda crashes it may leave things mounted under this path. It will
typically be set to /mnt/sysimage/
"""
dirinstall_path = os.path.abspath(dirinstall_path)
# unmount filesystems
for mounted in reversed(open("/proc/mounts").readlines()):
(_device, mountpoint, _rest) = mounted.split(" ", 2)
if mountpoint.startswith(dirinstall_path):
umount(mountpoint)
def novirt_install(opts, disk_img, disk_size): def novirt_install(opts, disk_img, disk_size):
""" """
Use Anaconda to install to a disk image Use Anaconda to install to a disk image
@ -754,8 +771,8 @@ def novirt_install(opts, disk_img, disk_size):
finally: finally:
log_monitor.shutdown() log_monitor.shutdown()
# If anaconda failed there may be things needing cleanup # Make sure any leftover anaconda mounts have been cleaned up
execWithRedirect("anaconda-cleanup", []) anaconda_cleanup(dirinstall_path)
# Move the anaconda logs over to a log directory # Move the anaconda logs over to a log directory
log_dir = os.path.abspath(os.path.dirname(opts.logfile)) log_dir = os.path.abspath(os.path.dirname(opts.logfile))