summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-07-14 20:19:26 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-07-14 20:19:26 +0000
commit50e95ae781a554b5bf4f921adf9bf2ab078868fe (patch)
tree020062b16af9fd580d7c8ecfd20823897fc84fd0
parentUpdated sed line. Thanks Christophe. (diff)
downloadgentoo-50e95ae781a554b5bf4f921adf9bf2ab078868fe.tar.gz
gentoo-50e95ae781a554b5bf4f921adf9bf2ab078868fe.tar.bz2
gentoo-50e95ae781a554b5bf4f921adf9bf2ab078868fe.zip
Added removal of /var/log/emerge.log to stage cleanup.
-rw-r--r--src/catalyst/ChangeLog8
-rw-r--r--src/catalyst/targets/stage1/stage1-preclean2-chroot.sh5
-rw-r--r--src/catalyst/targets/stage2/stage2-preclean-chroot.sh4
-rw-r--r--src/catalyst/targets/stage3/stage3-preclean-chroot.sh4
4 files changed, 15 insertions, 6 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog
index ca01acc7d5..7099b5c0f9 100644
--- a/src/catalyst/ChangeLog
+++ b/src/catalyst/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gentoo/src/catalyst
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.106 2005/07/14 19:54:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.107 2005/07/14 20:19:26 wolf31o2 Exp $
+
+ 14 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+ targets/stage1/stage1-preclean2-chroot.sh,
+ targets/stage2/stage2-preclean-chroot.sh,
+ targets/stage3/stage3-preclean-chroot.sh:
+ Added removal of /var/log/emerge.log to stage cleanup.
14 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org>
livecd/runscript-support/livecdfs-update.sh:
diff --git a/src/catalyst/targets/stage1/stage1-preclean2-chroot.sh b/src/catalyst/targets/stage1/stage1-preclean2-chroot.sh
index 7bff425c2e..475a6fcd9f 100644
--- a/src/catalyst/targets/stage1/stage1-preclean2-chroot.sh
+++ b/src/catalyst/targets/stage1/stage1-preclean2-chroot.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/Attic/stage1-preclean2-chroot.sh,v 1.10.2.3 2005/07/05 21:47:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage1/Attic/stage1-preclean2-chroot.sh,v 1.10.2.4 2005/07/14 20:19:26 wolf31o2 Exp $
# now, some finishing touches to initialize gcc-config....
unset ROOT
@@ -37,5 +37,4 @@ else
echo UTC > /etc/TZ
fi
-# this cleans out /var/db, but leaves behind files portage needs for removal
-#find /var/db/pkg -type f | grep -v '\(COUNTER\|CONTENTS\|SLOT\|ebuild\)' | xargs rm -f
+rm -f /var/log/emerge.log
diff --git a/src/catalyst/targets/stage2/stage2-preclean-chroot.sh b/src/catalyst/targets/stage2/stage2-preclean-chroot.sh
index 5591789e86..f0c0a5f510 100644
--- a/src/catalyst/targets/stage2/stage2-preclean-chroot.sh
+++ b/src/catalyst/targets/stage2/stage2-preclean-chroot.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/stage2/Attic/stage2-preclean-chroot.sh,v 1.4.2.1 2005/07/05 21:47:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage2/Attic/stage2-preclean-chroot.sh,v 1.4.2.2 2005/07/14 20:19:26 wolf31o2 Exp $
/usr/sbin/env-update
source /etc/profile
@@ -17,3 +17,5 @@ if [ -n "${clst_DISTCC}" ]
then
emerge -C sys-devel/distcc || exit 1
fi
+
+rm -f /var/log/emerge.log
diff --git a/src/catalyst/targets/stage3/stage3-preclean-chroot.sh b/src/catalyst/targets/stage3/stage3-preclean-chroot.sh
index 44b22f1846..1a3367a11f 100644
--- a/src/catalyst/targets/stage3/stage3-preclean-chroot.sh
+++ b/src/catalyst/targets/stage3/stage3-preclean-chroot.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/stage3/Attic/stage3-preclean-chroot.sh,v 1.4.2.1 2005/07/05 21:47:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/stage3/Attic/stage3-preclean-chroot.sh,v 1.4.2.2 2005/07/14 20:19:26 wolf31o2 Exp $
/usr/sbin/env-update
source /etc/profile
@@ -17,3 +17,5 @@ if [ -n "${clst_DISTCC}" ]
then
emerge -C sys-devel/distcc || exit 1
fi
+
+rm -f /var/log/emerge.log