Updating default configuration for catalyst and updating version stamp, since we...

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

diff --git a/ChangeLog b/ChangeLog
index 4817f5814b5461ef8f25f14de9d8778e4b6aef29..e544cc2ffc167641d891cb3a63224da5328ad779 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.334 2005/09/15 15:17:27 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.335 2005/09/30 20:16:50 wolf31o2 Exp $
+
+  30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  files/catalyst.conf:
+  Updating default configuration for catalyst and updating version stamp,
+  since we're beginning internal testing for release.
 
   15 Sep 2005; Eric Edgar <rocket@gentoo.org>
   modules/generic_stage_target.py:

diff --git a/catalyst b/catalyst
index 78e1c1256b4ee1c93cdf7d9464f673b500569650..489646a5af0504c1c95d1e92ac6aa5014475cb25 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.89 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.90 2005/09/30 20:16:50 wolf31o2 Exp $
 
 # Maintained in full by:
 # Eric Edgar <rocket@gentoo.org>
@@ -10,7 +10,7 @@
 import os,sys,imp,string,getopt
 import pdb
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.0_pre3"
+__version__="2.0._pre20050930"
 
 conf_values={}
 

diff --git a/files/catalyst.conf b/files/catalyst.conf
index 83237298f88f1900b026dc11b2f56031674cbb5f..d04903b014bd665bc756ed55722f9a45702721c6 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.12 2005/08/09 19:02:31 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/files/catalyst.conf,v 1.13 2005/09/30 20:16:50 wolf31o2 Exp $
 
 # Simple desriptions of catalyst settings. Please refer to the online
 # documentation for more information.
@@ -17,10 +17,10 @@ distdir="/usr/portage/distfiles"
 #      prematurely)
 # kerncache = keeps a tbz2 of your built kernel and modules (useful if your
 #      build stops in livecd-stage2)
-# seedcache = use the build output of a previous target if it exists to speed up 
-#      the copy
+# 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.
-options="pkgcache kerncache"
+options="pkgcache kerncache seedcache snapcache"
 
 # sharedir specifies where all of the catalyst runtime executables are. Most
 # users do not need to change this.