Ensure /etc/xml/catalog does not exist in stage1, since it will always be empty and...

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

diff --git a/ChangeLog b/ChangeLog
index 145a08dba8ba603dc3461b6322d6075e2608870b..b90b37cc3a42ef48e5b1458a573f1373b06a86ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-chroot.sh:
+  Ensure /etc/xml/catalog does not exist in stage1, since it will always be
+  empty and will cause issues in stage3 and beyond.
+
   08 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
   targets/support/kmerge.sh, targets/support/rc-update.sh:
   Changed some of the rc-update code so it should work with baselayout-2,

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index ef5cad2256ab51b26852e25944ace0df81bfe5ec..1e19b89dced96087c8315a71633bd3622352dafb 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -31,4 +31,5 @@ rm -f /var/lib/portage/world
 touch /var/lib/portage/world
 
 rm -f /var/log/emerge.log
+rm -f /etc/xml/catalog
 rm -rf /var/tmp/*