From e68d1c49ca41526c3c720c1a305dfa7397c7b02f Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 22 Nov 2006 19:06:02 +0000 Subject: [PATCH] OK. We've fixed the spacing issue with livecd-stage2, so this is 2.0.1, for real. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1194 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 5 +++++ modules/livecd_stage2_target.py | 22 +++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index c304173c..722878d3 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: + OK. We've fixed the spacing issue with livecd-stage2, so this is 2.0.1, for + real. + 22 Nov 2006; Chris Gianelloni modules/livecd_stage2_target.py: Reverted change in livecd-stage2 to the action_sequence until I can figure diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 5948d58e..ff56aac7 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -127,20 +127,16 @@ class livecd_stage2_target(generic_stage_target): def set_action_sequence(self): - self.settings["action_sequence"]=["unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay",\ - "bind","chroot_setup","setup_environment","run_local",\ - "build_kernel","bootloader","preclean","livecd_update",\ - "root_overlay","fsscript","rcupdate","unmerge",\ + 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","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") + "setup_overlay","create_iso"] + self.settings["action_sequence"].append("clear_autoresume") def register(foo): foo.update({"livecd-stage2":livecd_stage2_target}) -- 2.26.2