From: Chris Gianelloni Date: Wed, 22 Nov 2006 17:18:19 +0000 (+0000) Subject: Fixed the livecd-stage2 action_sequence and updated the isolinux cdtar's to include... X-Git-Tag: CATALYST_2_0_6_916~302 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf94ee9cc8bf5a8122b632adc932faaf5f1394fa;p=catalyst.git 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. 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 dabbd274..5e3f8e3a 100644 --- 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 + 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 modules/livecd_stage2_target.py, targets/support/livecdfs-update.sh: Added a patch from Bardur Arantsson which diff --git a/catalyst b/catalyst index 6c11fb2c..22f1166e 100755 --- a/catalyst +++ b/catalyst @@ -9,7 +9,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__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 fcc92e70..eb31eac6 100644 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 7f853601..54a5ccef 100644 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 5df2aa7b..a1abc043 100644 --- 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})