Fixed the livecd-stage2 action_sequence and updated the isolinux cdtar's to include...

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

diff --git a/ChangeLog b/ChangeLog
index dabbd274b2aebe7cf3331d9af9a8eaf296afd9f2..5e3f8e3aa11316eaf587357058ca6c4657fbf302 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $
 
+  22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2, catalyst,
+  livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2,
+  modules/livecd_stage2_target.py:
+  Fixed the livecd-stage2 action_sequence and updated the isolinux cdtar's to
+  include newer memtest86. This is catalyst 2.0.1 and ready to roll.
+
   22 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   modules/livecd_stage2_target.py, targets/support/livecdfs-update.sh:
   Added a patch from Bardur Arantsson <bugs-gentoo.org@scientician.net> which

diff --git a/catalyst b/catalyst
index 6c11fb2c54711977267cddb32bf51645a37a9d29..22f1166ed39b1e4cd7aeff725e0a896e4da29500 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -9,7 +9,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0"
+__version__="2.0.1"
 
 conf_values={}
 

diff --git a/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 b/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
index fcc92e705bcf3a16d70b7f0a42c89315765c9c3b..eb31eac64d715bb69e0de650fad7871fc23459cc 100644 (file)
Binary files a/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2 differ

diff --git a/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 b/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
index 7f8536013a2f5da1e77d20c7e18df15144c870f9..54a5ccefad92dd7384633d492a4668054ea8e467 100644 (file)
Binary files a/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 and b/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2 differ

diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py
index 5df2aa7b49cda8e05243d71d1c673f07321907a0..a1abc0430666691630a8b0e500e0b131a2aeadcb 100644 (file)
--- a/modules/livecd_stage2_target.py
+++ b/modules/livecd_stage2_target.py
@@ -132,11 +132,11 @@ class livecd_stage2_target(generic_stage_target):
                            "bind","chroot_setup","setup_environment","run_local",\
                            "build_kernel"]
                if not self.settings.has_key("FETCH"):
-                       self.settings["action_sequence"].append("bootloader","preclean",\
+                       self.settings["action_sequence"] += ["bootloader","preclean",\
                                "livecd_update","root_overlay","fsscript","rcupdate","unmerge",\
                            "unbind","remove","empty","target_setup",\
                            "setup_overlay","create_iso"]
-               self.settings["action_sequence"].append("clear_autoresume"]
+               self.settings["action_sequence"].append("clear_autoresume")
 
 def register(foo):
        foo.update({"livecd-stage2":livecd_stage2_target})