Added warning about breaking snapshot cache and re-enable autoresume, since the error...

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

diff --git a/ChangeLog b/ChangeLog
index 2f8f1de6bffe7969cb33e45170930e070552b7e7..78190da26344fa1bbd57d127d0f1dd9d0db33518 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.444 2005/12/09 16:18:23 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.445 2005/12/09 17:22:57 wolf31o2 Exp $
+
+  09 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/catalyst.conf:
+  Added warning about breaking snapshot cache and re-enable autoresume, since
+  the errors I was getting were elsewhere.
 
   09 Dec 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/files/catalyst.conf b/files/catalyst.conf
index 72280f2ffe4868fd9bef8782f4a9b96883ae5cd9..f7fb10f78f9b643948c3def72206e8ad7a6fbd6a 100644 (file)
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.18 2005/12/08 03:17:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.19 2005/12/09 17:22:57 wolf31o2 Exp $
 
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
@@ -24,12 +24,14 @@ distdir="/usr/portage/distfiles"
 # seedcache = use the build output of a previous target if it exists to speed up
 #      the copy
 # snapcache = cache the snapshot so that it can be bind-mounted into the chroot.
+#  WARNING: moving parts of the portage tree from within fsscript *will* break
+#  your cache.  The cache is unlinked before any empty or rm processing, though.
 #
 # DIGESTS CREATION 
 # md5 = Create a .digests file containing the md5 of the output object
 # sha = Create a .digests file containing the sha1 of the output object
 # (These options can be used together)
-options="kerncache md5 pkgcache seedcache sha snapcache"
+options="autoresume kerncache md5 pkgcache seedcache sha snapcache"
 
 # sharedir specifies where all of the catalyst runtime executables are. Most
 # users do not need to change this.