From: Chris Gianelloni Date: Thu, 14 Feb 2008 18:30:05 +0000 (+0000) Subject: We need to be sure we clear out /var/log/portage/elog as well as /var/log/emerge... X-Git-Tag: CATALYST_2_0_6_916~191 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b73acd1764e0c432740faf2ad807cfec5629f8ec;p=catalyst.git We need to be sure we clear out /var/log/portage/elog as well as /var/log/emerge.log for stages 1 through 3. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1303 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index bce6946d..09e4fb44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 14 Feb 2008; Chris Gianelloni + targets/stage1/stage1-chroot.sh, targets/stage2/stage2-chroot.sh, + targets/stage3/stage3-chroot.sh: + We need to be sure we clear out /var/log/portage/elog as well as + /var/log/emerge.log for stages 1 through 3. + 14 Feb 2008; Chris Gianelloni catalyst, modules/generic_stage_target.py, targets/livecd-stage2/livecd-stage2-controller.sh, diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index 4464196f..62fd52ba 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -45,6 +45,5 @@ USE="-* bindist build ${STAGE1_USE} ${HOSTUSE}" run_emerge "--noreplace --onesho rm -f /var/lib/portage/world touch /var/lib/portage/world -rm -f /var/log/emerge.log -rm -f /etc/xml/catalog +rm -f /var/log/emerge.log /var/log/portage/elog/* /etc/xml/catalog rm -rf /var/tmp/* diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh index 002a6051..ec9016cc 100755 --- a/targets/stage2/stage2-chroot.sh +++ b/targets/stage2/stage2-chroot.sh @@ -24,3 +24,4 @@ fi ## START BUILD /usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 +rm -f /var/log/emerge.log /var/log/portage/elog/* diff --git a/targets/stage3/stage3-chroot.sh b/targets/stage3/stage3-chroot.sh index a1e65ea0..7e1665ec 100755 --- a/targets/stage3/stage3-chroot.sh +++ b/targets/stage3/stage3-chroot.sh @@ -16,3 +16,5 @@ run_emerge "-e system" rm -f /var/lib/portage/world touch /var/lib/portage/world + +rm -f /var/log/emerge.log /var/log/portage/elog/*