From c6be0fc2d67281477f8c802d5a55191ea03e552c Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 3 Nov 2006 22:13:50 +0000 Subject: [PATCH] Added a check to see if we have the tarball option enabled, which causes catalyst to run the capture sequence. This was requested by Tim Yamin for the stage4 target, but I thought it should be usable on any stage target. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1184 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ modules/generic_stage_target.py | 5 ++++- modules/stage4_target.py | 6 +++++- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25176497..48b6ad05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # 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 $ + 03 Nov 2006; Chris Gianelloni + modules/generic_stage_target.py, modules/stage4_target.py: + Added a check to see if we have the tarball option enabled, which causes + catalyst to run the capture sequence. This was requested by Tim Yamin for + the stage4 target, but I thought it should be usable on any stage target. + 03 Nov 2006; Chris Gianelloni targets/support/livecdfs-update.sh: Moved fstab tweaks all into one location and added make.conf tweak for bug diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index a52ff19e..2d5c8537 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -401,7 +401,10 @@ class generic_stage_target(generic_target): #Default action sequence for run method self.settings["action_sequence"]=["unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay","bind","chroot_setup",\ - "setup_environment","run_local","preclean","unbind","clean","capture","clear_autoresume"] + "setup_environment","run_local","preclean","unbind","clean"] + if not self.settings.has_key("TARBALL"): + self.settings["action_sequence"].append("capture") + self.settings["action_sequence"].append("clear_autoresume") def set_use(self): if self.settings.has_key(self.settings["spec_prefix"]+"/use"): diff --git a/modules/stage4_target.py b/modules/stage4_target.py index 5e57b4da..8dee8d3d 100644 --- a/modules/stage4_target.py +++ b/modules/stage4_target.py @@ -27,7 +27,11 @@ class stage4_target(generic_stage_target): "bind","chroot_setup","setup_environment","build_packages",\ "build_kernel","bootloader","root_overlay","fsscript",\ "preclean","rcupdate","unmerge","unbind","remove","empty",\ - "clean","capture", "clear_autoresume"] + "clean"] + + if self.settings.has_key("TARBALL"): + self.settings["action_sequence"].append("capture") + self.settings["action_sequence"].append("clear_autoresume") def register(foo): foo.update({"stage4":stage4_target}) -- 2.26.2