OK, we run our find outside the chroot, so we don't want to use absolute paths unless...

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

diff --git a/ChangeLog b/ChangeLog
index 47d2e9dd32400dd7eadc34a0bc9a451ddee801c1..5b8e9c995426e8de7c991f41f1882d96afd0829b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  targets/livecd-stage2/livecd-stage2-controller.sh:
+  OK, we run our find outside the chroot, so we don't want to use absolute
+  paths unless we want to wipe out *.a *.la *.pyc and *.pyo from our host
+  system. Oops. Due to this bug, I'm making this 2.0.6_pre15 for testing
+  immediately.
+
   13 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/livecd-stage2/livecd-stage2-controller.sh,
   targets/stage1/stage1-controller.sh:

diff --git a/catalyst b/catalyst
index 0b97f487295b4119c4141199bf582425ae0e52bb..01695ea59a36a5d17d1895fe810a3dcd2c7bd9b6 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre14"
+__version__="2.0.6_pre15"
 
 conf_values={}
 

diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index 0185b18a9f59867c40ae04c3e33a7a333ac2fd9b..071635ffe534228ebdc9ef838731d9ac706835af 100755 (executable)
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -101,11 +101,11 @@ case $1 in
                        # Clean out man, info and doc files
                        rm -rf usr/share/{man,doc,info}/*
                        # Zap all .pyc and .pyo files
-                       find / -iname "*.py[co]" -exec rm -f {} \;
+                       find usr/lib -iname "*.py[co]" -exec rm -f {} \;
                fi
                # Cleanup all .a files except libgcc.a, *_nonshared.a and
                # /usr/lib/portage/bin/*.a
-               find / -type f -iname "*.a" | grep -v 'libgcc.a' | \
+               find usr/lib -type f -iname "*.a" | grep -v 'libgcc.a' | \
                        grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
                        grep -v 'libgcc_eh.a' | xargs rm -f
                ;;