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

anaconda_cleanup: Remove anaconda.pid if it is left behind

Browse Source 
When a novirt-install fails or is canceled anaconda may leave its pid
file behind. Add it to the cleanup function.

Resolves: rhbz#1788501
This commit is contained in:
Brian C. Lane 2020-01-07 15:42:16 -08:00
parent 3b7ab99991
commit cd65758ebe
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pylorax/installer.py
View File

@ -308,7 +308,17 @@ def anaconda_cleanup(dirinstall_path):
Attempts to cleanup may also fail. Catch these and continue trying the Attempts to cleanup may also fail. Catch these and continue trying the
other mountpoints. other mountpoints.
Anaconda may also leave /run/anaconda.pid behind, clean that up as well.
""" """
# Anaconda may not clean up its /var/run/anaconda.pid file
# Make sure the process is really finished (it should be, since it was started from a subprocess call)
# and then remove the pid file.
if os.path.exists("/var/run/anaconda.pid"):
# lorax-composer runs anaconda using unshare so the pid is always 1
if open("/var/run/anaconda.pid").read().strip() == "1":
os.unlink("/var/run/anaconda.pid")
rc = True rc = True
dirinstall_path = os.path.abspath(dirinstall_path) dirinstall_path = os.path.abspath(dirinstall_path)
# unmount filesystems # unmount filesystems