From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Thu, 6 Oct 2005 15:50:02 +0000 (+0000)
Subject: Removed livecd/runscript and livecd/archscript from livecd-stage2 example spec templa... 
X-Git-Tag: CATALYST_2_0_6_916~648
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf018898a970926f8578ed2719aca019a95d9fc6;p=catalyst.git

Removed livecd/runscript and livecd/archscript from livecd-stage2 example spec template and updating version stamp.


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

diff --git a/ChangeLog b/ChangeLog
index 5cb9a346..dd50b978 100644
--- 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.338 2005/10/06 15:45:28 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.339 2005/10/06 15:50:02 wolf31o2 Exp $
+
+  06 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  examples/livecd-stage2_template.spec:
+  Removed livecd/runscript and livecd/archscript from livecd-stage2 example
+  spec template and updating version stamp.
 
   06 Oct 2005; Eric Edgar <rocket@gentoo.org> catalyst,
   modules/catalyst_support.py:
diff --git a/catalyst b/catalyst
index ee61c798..eb81db21 100755
--- 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.91 2005/10/06 15:45:28 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/catalyst,v 1.92 2005/10/06 15:50:02 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._pre20050930"
+__version__="2.0_pre20051006"
 
 conf_values={}
 
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index 0e14c36e..c407d362 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -56,7 +56,7 @@ distcc_hosts:
 # portage_confdir: /etc/portage
 portage_confdir:
 
-# The cdfstype is used to determine what sort of CD we should build.  This is
+# The fstype is used to determine what sort of CD we should build.  This is
 # used to set the type of loopback filesystem that we will use on our CD.
 # Possible options are as follows:
 # squashfs - This gives the best compression, but requires a kernel patch.
@@ -64,21 +64,8 @@ portage_confdir:
 # normal - This creates a loop without compression.
 # noloop - This copies the files to the CD directly, withuot using a loopback.
 # example:
-# livecd/cdfstype: squashfs
-livecd/cdfstype:
-
-# The archscript is for architecture-dependent configuration.  Not all Gentoo
-# architectures use their own archscript.  Some share with other architectures
-# that are similar.
-# example:
-# livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
-livecd/archscript:
-
-# The runscript is the "brains" of the livecd-stage2 target and is designed to
-# be architecturer agnostic.  It is best not to change this.
-# example:
-# livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
-livecd/runscript:
+# livecd/fstype: squashfs
+livecd/fstype:
 
 # The cdtar is essentially the bootloader for the CD.  It also holds the main
 # configuration for the bootloader.  On x86/amd64, it also can include a small