From 5e134ee7c18c2f1e9c9ae511bfbd85a3ebb4b586 Mon Sep 17 00:00:00 2001 From: "John P. Davis" Date: Tue, 3 Aug 2004 00:09:24 +0000 Subject: [PATCH] bugfix #58208 git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@425 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 ++++- modules/generic_stage_target.py | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92871b9f..402cf6fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gentoo/src/catalyst # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.75 2004/08/02 23:48:15 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.76 2004/08/03 00:09:24 zhen Exp $ + + 02 Aug 2004; John Davis modules/generic_stage_target.py: + fix for bug #58208 02 Aug 2004; John Davis livecd/runscript-support/livecdfs-update.sh: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index bed9b6d6..1e694e6f 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Distributed under the GNU General Public License version 2 # Copyright 2003-2004 Gentoo Technologies, Inc. -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.8 2004/08/02 23:23:34 zhen Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.9 2004/08/03 00:09:24 zhen Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -368,8 +368,7 @@ class generic_stage_target(generic_target): myf.close() outf.close() os.rename(self.settings["chroot_path"]+"/tmp/out.txt",self.settings["chroot_path"]+"/etc/passwd") - cmd("/usr/bin/pkill -U 7980","could not kill distcc process(es)") - + try: cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+\ "/"+self.settings["target"]+".sh preclean","preclean script failed.") @@ -446,6 +445,10 @@ class generic_stage_target(generic_target): self.unmerge() self.unbind() + # kill distcc processes outside of the chroot + if self.settings.has_key("DISTCC"): + cmd("/usr/bin/pkill -U 7980","could not kill distcc process(es)") + if self.settings["target"] in ["stage1","stage2","stage3","livecd-stage2"]: # clean is for removing things after bind-mounts are # unmounted (general file removal and cleanup) -- 2.26.2