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

Revert "lorax-composer: Cancel running Anaconda process"

Browse Source 
Drop running pkill. This causes problems if more than one is running on
a system (eg. in parallel using mock). It can kill off other processes
unrelated to this instance of anaconda.

This reverts commit e3e892ea43.
This commit is contained in:
Brian C. Lane 2019-01-08 14:12:14 -08:00
parent 8b59860217
commit a466f26c95
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pylorax/installer.py
View File

@ -21,9 +21,9 @@ import glob
import json import json
from math import ceil from math import ceil
import os import os
import subprocess
import shutil import shutil
import socket import socket
import subprocess
import tempfile import tempfile
# Use the Lorax treebuilder branch for iso creation # Use the Lorax treebuilder branch for iso creation
@ -285,10 +285,7 @@ def novirt_cancel_check(cancel_funcs, proc):
""" """
for f in cancel_funcs: for f in cancel_funcs:
if f(): if f():
log.info("Terminating process %d", proc.pid)
proc.terminate() proc.terminate()
# NOTE: Have to return and allow execReadlines to call proc.communicate()
return True return True
return False return False
@ -389,7 +386,6 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None):
for line in execReadlines("anaconda", args, reset_lang=False, for line in execReadlines("anaconda", args, reset_lang=False,
env_add={"ANACONDA_PRODUCTNAME": opts.project, env_add={"ANACONDA_PRODUCTNAME": opts.project,
"ANACONDA_PRODUCTVERSION": opts.releasever}, "ANACONDA_PRODUCTVERSION": opts.releasever},
reset_handlers=False,
callback=lambda p: not novirt_cancel_check(cancel_funcs, p)): callback=lambda p: not novirt_cancel_check(cancel_funcs, p)):
log.info(line) log.info(line)
@ -445,12 +441,6 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None):
log.debug("Removing loop device for %s", disk_img) log.debug("Removing loop device for %s", disk_img)
loop_detach("/dev/"+get_loop_name(disk_img)) loop_detach("/dev/"+get_loop_name(disk_img))
# When anaconda crashes or is canceled it leaves pyanaconda.* running
execWithRedirect("pkill", ["-f", "pyanaconda."])
# It can also leave dbus running
execWithRedirect("pkill", ["-f", "anaconda-bus.conf"])
# qemu disk image is used by bare qcow2 images and by Vagrant # qemu disk image is used by bare qcow2 images and by Vagrant
if opts.image_type: if opts.image_type:
log.info("Converting %s to %s", disk_img, opts.image_type) log.info("Converting %s to %s", disk_img, opts.image_type)