From: Chris Gianelloni Date: Fri, 8 Feb 2008 19:18:09 +0000 (+0000) Subject: Ensure /etc/xml/catalog does not exist in stage1, since it will always be empty and... X-Git-Tag: CATALYST_2_0_6_916~203 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3015374665c6582a2d4917129d93df1013ae70af;p=catalyst.git Ensure /etc/xml/catalog does not exist in stage1, since it will always be empty and will cause issues in stage3 and beyond. 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 145a08db..b90b37cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 08 Feb 2008; Chris Gianelloni + 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 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 ef5cad22..1e19b89d 100755 --- 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/*