distcc fixups

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@386 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index ad712b6785423c8cab0d4d5391e82aa0da9936a8..4a0d906fa7849e6bcfb99dd44f9d7fa29d80f289 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,21 @@
 # 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.57 2004/06/02 06:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.58 2004/06/04 14:03:46 zhen Exp $
+
+  04 Jun 2004; John Davis <zhen@gentoo.org> modules/generic_stage_target.py,
+  targets/embedded/embedded-chroot.sh,
+  targets/embedded/embedded-preclean-chroot.sh, targets/grp/grp-chroot.sh,
+  targets/grp/grp-preclean-chroot.sh, targets/grp/grp.sh,
+  targets/livecd-stage1/livecd-stage1-chroot.sh,
+  targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,
+  targets/livecd-stage1/livecd-stage1.sh, targets/stage1/stage1-chroot.sh,
+  targets/stage1/stage1-preclean1-chroot.sh, targets/stage1/stage1.sh,
+  targets/stage2/stage2-chroot.sh, targets/stage2/stage2-preclean-chroot.sh,
+  targets/stage3/stage3-chroot.sh, targets/stage3/stage3-preclean-chroot.sh,
+  targets/tinderbox/tinderbox-chroot.sh,
+  targets/tinderbox/tinderbox-preclean-chroot.sh,
+  targets/tinderbox/tinderbox.sh:
+  Fixes bug 51603, a lot of distcc fixups (has to do w/ bind mounts and such)
 
   02 Jun 2004; John Davis <zhen@gentoo.org> modules/snapshot_target.py:
   Fixes to address bugs #51072 and #52045. The snapshot logic was tweaked to be

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index af5c2126436aee70cf5247f2c8f66ee27c6c3e09..4502941ce44826d7239a2edd6cc61a34b4d98e63 100644 (file)
--- 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.1 2004/05/17 01:21:17 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.2 2004/06/04 14:03:46 zhen Exp $
 
 """
 This class does all of the chroot setup, copying of files, etc. It is
@@ -231,6 +231,12 @@ class generic_stage_target(generic_target):
                else:
                        myf.write('CXXFLAGS="${CFLAGS}"\n')
                myf.close()
+
+               #create entry in /etc/passwd for distcc user
+               if self.settings.has_key("DISTCC"): 
+                       myf=open(self.settings["chroot_path"]+"/etc/passwd","a")
+                       myf.write("distcc:x:7980:2:distccd:/dev/null:/bin/false\n")
+                       myf.close()
                
        def clean(self):
                destpath=self.settings["chroot_path"]
@@ -246,6 +252,7 @@ class generic_stage_target(generic_target):
                for x in cleanables: 
                        print "Cleaning chroot: "+x+"..."
                        cmd("rm -rf "+destpath+x,"Couldn't clean "+x)
+               
                if self.settings["target"]=="livecd-stage2":
                        if self.settings.has_key("livecd/empty"):
                                if type(self.settings["livecd/empty"])==types.StringType:
@@ -273,6 +280,17 @@ class generic_stage_target(generic_target):
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/"+self.settings["target"]+".sh clean","clean script failed.")
        
        def preclean(self):
+               #cleanup after distcc
+               if self.settings.has_key("DISTCC"):
+                       myf=open(self.settings["chroot_path"]+"/etc/passwd","r")
+                       outf=open(self.settings["chroot_path"]+"/tmp/out.txt","w")
+                       for line in myf:
+                               if not line.startswith("distcc:"):
+                                       outf.write(line)
+                       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.")
                except:

diff --git a/targets/embedded/embedded-chroot.sh b/targets/embedded/embedded-chroot.sh
index 3347505db35ff30be72dec54f854fe219be7cb17..0f4db1726c26a0071140d50553ef515d75c5c5d3 100755 (executable)
--- a/targets/embedded/embedded-chroot.sh
+++ b/targets/embedded/embedded-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.3 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-chroot.sh,v 1.4 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -23,7 +23,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gtk -gnome" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/embedded/embedded-preclean-chroot.sh b/targets/embedded/embedded-preclean-chroot.sh
index f1d99e98cca387d81d5c5ae3238607373fa9d692..c2905e5525a3a9252e118288a78f2032c1621d16 100755 (executable)
--- a/targets/embedded/embedded-preclean-chroot.sh
+++ b/targets/embedded/embedded-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/embedded/embedded-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-if [ -n "${clst_DISTCC}" ]
-then
-       pkill -signal 9 -U 7980
-       userdel distcc || exit 1
-fi

diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index b6e51d79550717f2a593578d095f75b1bd606db8..6dccf31658c67acdc4b5d226d2ea12b7a16a2a66 100755 (executable)
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.2 2004/04/14 14:27:38 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi
@@ -48,16 +47,7 @@ else
        unset DISTDIR
        #don't grab MS core fonts, etc.
        export USE="${USE} bindist"
-       #first grab to the normal distdir
        
-       ## why don't we just set distdir first and fetch once???
        DISTDIR="/tmp/grp/${clst_grp_target}" emerge --fetchonly ${clst_grp_packages} || exit 1
-       #export DISTDIR="/tmp/grp/${clst_grp_target}"
-       #export OLD_MIRRORS="${GENTOO_MIRRORS}"
-       #export GENTOO_MIRRORS="/usr/portage/distfiles"
-       #now grab them again, but with /usr/portage/distfiles as the primary mirror (local grab)
-       #emerge --fetchonly ${clst_grp_packages} || exit 1
-       #restore original GENTOO_MIRRORS setting, if any
-       #export GENTOO_MIRRORS="${OLD_MIRRORS}"
        unset PKGDIR
 fi

diff --git a/targets/grp/grp-preclean-chroot.sh b/targets/grp/grp-preclean-chroot.sh
index 48943530b54b022a77e32c3ecf8aa4e03ac6c3d0..e14982d13f55096f72b914111df96c1634047130 100755 (executable)
--- a/targets/grp/grp-preclean-chroot.sh
+++ b/targets/grp/grp-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.2 2004/04/14 14:27:38 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/grp-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-if [ -n "${clst_DISTCC}" ]
-then
-       pkill -signal 9 -U 7980
-       userdel distcc || exit 1
-fi

diff --git a/targets/grp/grp.sh b/targets/grp/grp.sh
index 521dcd9febf9107626a10e21ce36b70ab09d5d17..16da68f2ce4b77ce3cae6aa80b85a7a8455abec4 100755 (executable)
--- a/targets/grp/grp.sh
+++ b/targets/grp/grp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.16 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/grp/Attic/grp.sh,v 1.17 2004/06/04 14:03:46 zhen Exp $
 
 case $1 in
        enter)
@@ -20,9 +20,10 @@ case $1 in
        ;;
 
        preclean)
-               cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
-               ${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh || exit 1
-               rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
+               #cp ${clst_sharedir}/targets/grp/grp-preclean-chroot.sh ${clst_chroot_path}/tmp
+               #${clst_CHROOT} ${clst_chroot_path} /tmp/grp-preclean-chroot.sh || exit 1
+               #rm -f ${clst_chroot_path}/tmp/grp-preclean-chroot.sh
+               exit 0
        ;;
 
        clean)

diff --git a/targets/livecd-stage1/livecd-stage1-chroot.sh b/targets/livecd-stage1/livecd-stage1-chroot.sh
index 5e77e0b8ae9a1d189dd5638267fa0720c9bd47aa..2f6abc1bad4be3b25a246a8c999f3feb9245eb92 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
index 04799089bedc709aff60709477d3bb6e3108154a..2c3564064215a749065c49fe6d4a238921dbe02d 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
+++ b/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-if [ -n "${clst_DISTCC}" ]
-then
-       pkill -signal 9 -U 7980
-       userdel distcc || exit 1
-fi

diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index 03f3e7ddf205369927b7e2a6a99d0d500b4e96e7..c3b1bba46fe283588aa6e507c3132fc61b3d3861 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1.sh
+++ b/targets/livecd-stage1/livecd-stage1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.11 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.12 2004/06/04 14:03:46 zhen Exp $
 
 case $1 in
        enter)
@@ -16,9 +16,10 @@ case $1 in
        ;;
 
        preclean)
-        cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
-        ${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
-               rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh
+        #cp ${clst_sharedir}/targets/livecd-stage1/livecd-stage1-preclean-chroot.sh ${clst_chroot_path}/tmp
+        #${clst_CHROOT} ${clst_chroot_path} /tmp/livecd-stage1-preclean-chroot.sh || exit 1
+               #rm -f ${clst_chroot_path}/tmp/livecd-stage1-preclean-chroot.sh
+               exit 0
     ;;
 
     clean)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 6bb56a2a6575909e43d12fdb848457a16c35bb85..931b7db4a6e6a729f5f1c17b444e6d738bed61ea 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.15 2004/05/11 20:03:49 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-chroot.sh,v 1.16 2004/06/04 14:03:46 zhen Exp $
                
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gtk -gnome" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/stage1/stage1-preclean1-chroot.sh b/targets/stage1/stage1-preclean1-chroot.sh
index 02f6f24dd5fba5212db10fd6c308eb1fd28f5942..1b9d029604acf89ba0520199521b725aeb10f6a2 100755 (executable)
--- a/targets/stage1/stage1-preclean1-chroot.sh
+++ b/targets/stage1/stage1-preclean1-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-preclean1-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-preclean1-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-if [ -n "${clst_DISTCC}" ]
-then
-       pkill -signal 9 -U 7980
-       userdel distcc || exit 1
-fi

diff --git a/targets/stage1/stage1.sh b/targets/stage1/stage1.sh
index db34b91b7ffe0d0b0cfebc3ea3901ec88408a76c..b002a6e4d9054f51767e00770018604c99137c00 100755 (executable)
--- a/targets/stage1/stage1.sh
+++ b/targets/stage1/stage1.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.12 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1.sh,v 1.13 2004/06/04 14:03:46 zhen Exp $
 
 case $1 in
        enter)
@@ -27,9 +27,9 @@ case $1 in
                #preclean runs with bind mounts active -- for running any commands inside chroot
                
                #first we cleanup after ourselves
-               cp ${clst_sharedir}/targets/stage1/stage1-preclean1-chroot.sh ${clst_chroot_path}/tmp
-        ${clst_CHROOT} ${clst_chroot_path} /tmp/stage1-preclean1-chroot.sh || exit 1
-        rm -f ${clst_chroot_path}/tmp/stage1-preclean1-chroot.sh
+               #cp ${clst_sharedir}/targets/stage1/stage1-preclean1-chroot.sh ${clst_chroot_path}/tmp
+        #${clst_CHROOT} ${clst_chroot_path} /tmp/stage1-preclean1-chroot.sh || exit 1
+        #rm -f ${clst_chroot_path}/tmp/stage1-preclean1-chroot.sh
 
                #second we do the gcc magic
                cp ${clst_sharedir}/targets/stage1/stage1-preclean2-chroot.sh ${clst_chroot_path}/tmp/stage1root/tmp

diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index cac3fab85df17b1cef0f9a09112fac74a6b8e226..931404bfcb8ff720bf7e3fcde7a7d8283ff1046a 100755 (executable)
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
index ec45d9d3efe3190aa03fb15ec6a8efb38c057012..29216bee49a24270efea041727a72fc707b01f45 100755 (executable)
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-preclean-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/stage2-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -16,5 +16,4 @@ fi
 if [ -n "${clst_DISTCC}" ]
 then
        emerge -C sys-devel/distcc || exit 1
-       userdel distcc || exit 1
 fi

diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh
index fa223cbc59bd1806168db936e4c20dedb6d32493..68f9b7bade6fd51fba1021b34af4e645220d45a6 100755 (executable)
--- a/targets/stage3/stage3-chroot.sh
+++ b/targets/stage3/stage3-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.3 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-chroot.sh,v 1.4 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index 220d0bd80972c022719f59136339e8e6fbacf77b..fd5dfab216d118cce8f3ce4344ef6af0cd4105fc 100755 (executable)
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-preclean-chroot.sh,v 1.2 2004/04/14 00:17:59 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/stage3-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -15,7 +15,5 @@ fi
 
 if [ -n "${clst_DISTCC}" ]
 then
-       pkill -signal 9 -U 7980
        emerge -C sys-devel/distcc || exit 1
-       userdel distcc || exit 1
 fi

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index 0b91d40fdd93acbc08aa02fcbae3b831dc3f8c2a..f6655db445b0be3c164f1f35c898700ad51522de 100755 (executable)
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
@@ -24,7 +24,6 @@ then
        export DISTCC_HOSTS="${clst_distcc_hosts}"
 
        USE="-gnome -gtk" emerge --oneshot --nodeps distcc || exit 1
-       echo "distcc:x:7980:2:distccd:/dev/null:/bin/false" >> /etc/passwd
        /usr/bin/distcc-config --install 2>&1 > /dev/null
        /usr/bin/distccd 2>&1 > /dev/null
 fi

diff --git a/targets/tinderbox/tinderbox-preclean-chroot.sh b/targets/tinderbox/tinderbox-preclean-chroot.sh
index b60b9b2609288743f35ef2a202aabad63643422a..182101b84c4f568c7214d1e7c9b4cefc45c4bc17 100755 (executable)
--- a/targets/tinderbox/tinderbox-preclean-chroot.sh
+++ b/targets/tinderbox/tinderbox-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.2 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/tinderbox-preclean-chroot.sh,v 1.3 2004/06/04 14:03:46 zhen Exp $
 
 /usr/sbin/env-update
 source /etc/profile
-
-if [ -n "${clst_DISTCC}" ]
-then
-       pkill -signal 9 -U 7980
-       userdel distcc || exit 1
-fi

diff --git a/targets/tinderbox/tinderbox.sh b/targets/tinderbox/tinderbox.sh
index 144845022430e15d24786da531e170e177cca107..9bdc88c421b26cfcc9e594cce295f121111532c5 100755 (executable)
--- a/targets/tinderbox/tinderbox.sh
+++ b/targets/tinderbox/tinderbox.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.8 2004/04/14 22:35:29 zhen Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/tinderbox/Attic/tinderbox.sh,v 1.9 2004/06/04 14:03:46 zhen Exp $
 
 case $1 in
        run)
@@ -13,9 +13,10 @@ case $1 in
        ;;
 
        preclean)
-        cp ${clst_sharedir}/targets/grp/tinderbox-preclean-chroot.sh ${clst_chroot_path}/tmp
-        ${clst_CHROOT} ${clst_chroot_path} /tmp/tinderbox-preclean-chroot.sh || exit 1
-        rm -f ${clst_chroot_path}/tmp/tinderbox-preclean-chroot.sh
+        #cp ${clst_sharedir}/targets/grp/tinderbox-preclean-chroot.sh ${clst_chroot_path}/tmp
+        #${clst_CHROOT} ${clst_chroot_path} /tmp/tinderbox-preclean-chroot.sh || exit 1
+        #rm -f ${clst_chroot_path}/tmp/tinderbox-preclean-chroot.sh
+               exit 0
     ;;
 
     clean)