From a466f26c9596ad5eab523e4a17913a41d6f2961b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 8 Jan 2019 14:12:14 -0800 Subject: [PATCH] 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 e3e892ea4304362a3db3678dcbaf729369ef18c3. --- src/pylorax/installer.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/pylorax/installer.py b/src/pylorax/installer.py index d1bd7785..ec9e9d69 100644 --- a/src/pylorax/installer.py +++ b/src/pylorax/installer.py @@ -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 @@ -285,10 +285,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 @@ -389,7 +386,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) @@ -445,12 +441,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)