From: Chris Gianelloni Date: Wed, 22 Nov 2006 18:37:32 +0000 (+0000) Subject: Reverted change in livecd-stage2 to the action_sequence until I can figure out what... X-Git-Tag: CATALYST_2_0_6_916~301 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f88d4e848e73f418dfd601a8a98c792e136a1a41;p=catalyst.git Reverted change in livecd-stage2 to the action_sequence until I can figure out what the problem is with it. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1193 d1e1f19c-881f-0410-ab34-b69fee027534 --- diff --git a/ChangeLog b/ChangeLog index 5e3f8e3a..c304173c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ # 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 + modules/livecd_stage2_target.py: + Reverted change in livecd-stage2 to the action_sequence until I can figure + out what the problem is with it. + 22 Nov 2006; Chris Gianelloni livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2, catalyst, livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2, diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index a1abc043..5948d58e 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -130,13 +130,17 @@ class livecd_stage2_target(generic_stage_target): self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay",\ "bind","chroot_setup","setup_environment","run_local",\ - "build_kernel"] - if not self.settings.has_key("FETCH"): - 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") + "build_kernel","bootloader","preclean","livecd_update",\ + "root_overlay","fsscript","rcupdate","unmerge",\ + "unbind","remove","empty","target_setup",\ + "setup_overlay","create_iso","clear_autoresume"] +# "build_kernel"] +# if not self.settings.has_key("FETCH"): +# 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") def register(foo): foo.update({"livecd-stage2":livecd_stage2_target})