Added a -type f to the find call in stage1 for bug #132180.

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

diff --git a/ChangeLog b/ChangeLog
index 90704f789fdb1daec85dae7ec97bfd0a426f1a46..3dd3336c8241122471a4bfec505f112c2bcf642c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.625 2006/05/19 22:02:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.626 2006/05/23 20:00:19 wolf31o2 Exp $
+
+  23 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-controller.sh:
+  Added a -type f to the find call in stage1 for bug #132180.
 
   19 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2:

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index b7b7e9d841602a6d212681c2228dba3ee7d9af4a..0bf2de400e519b0440083a4e8ad51f68d83495aa 100755 (executable)
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.12 2006/01/04 19:51:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/stage1-controller.sh,v 1.13 2006/05/23 20:00:19 wolf31o2 Exp $
 
 . ${clst_sharedir}/targets/support/functions.sh
 
@@ -60,8 +60,8 @@ case $1 in
                find -iname "*.py[co]" -exec rm -f {} \;
                # Cleanup all .a files except libgcc.a, *_nonshared.a and
                # /usr/lib/portage/bin/*.a
-               find -iname "*.a" | grep -v 'libgcc.a' | grep -v 'nonshared.a' | \
-                       grep -v '/usr/lib/portage/bin/' | grep -v 'libgcc_eh.a' | xargs \
+               find -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
        ;;
        *)