Revert "lorax-composer: Cancel running Anaconda process"
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 6b5c4df8b5
.
This commit is contained in:
parent
c53de4e63c
commit
7ee3b3d661
@ -21,9 +21,9 @@ import glob
|
||||
import json
|
||||
from math import ceil
|
||||
import os
|
||||
import subprocess
|
||||
import shutil
|
||||
import socket
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
# Use the Lorax treebuilder branch for iso creation
|
||||
@ -284,10 +284,7 @@ def novirt_cancel_check(cancel_funcs, proc):
|
||||
"""
|
||||
for f in cancel_funcs:
|
||||
if f():
|
||||
log.info("Terminating process %d", proc.pid)
|
||||
proc.terminate()
|
||||
|
||||
# NOTE: Have to return and allow execReadlines to call proc.communicate()
|
||||
return True
|
||||
return False
|
||||
|
||||
@ -388,7 +385,6 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None):
|
||||
for line in execReadlines("anaconda", args, reset_lang=False,
|
||||
env_add={"ANACONDA_PRODUCTNAME": opts.project,
|
||||
"ANACONDA_PRODUCTVERSION": opts.releasever},
|
||||
reset_handlers=False,
|
||||
callback=lambda p: not novirt_cancel_check(cancel_funcs, p)):
|
||||
log.info(line)
|
||||
|
||||
@ -444,12 +440,6 @@ def novirt_install(opts, disk_img, disk_size, cancel_func=None):
|
||||
log.debug("Removing loop device for %s", 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
|
||||
if opts.image_type:
|
||||
log.info("Converting %s to %s", disk_img, opts.image_type)
|
||||
|
Loading…
Reference in New Issue
Block a user