From 4d6f99c479e21ab8e3dcf0581d059f9ef09f9c7e Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Fri, 22 Apr 2005 18:33:06 +0000 Subject: [PATCH] Change ordering of tasks so root_overlay and fsscript occur after livecd_update, giving users a chance to override livecd_update git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@624 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 +++++++- modules/embedded_target.py | 10 ++++++---- modules/generic_stage_target.py | 4 +--- modules/livecd_stage2_target.py | 8 ++++---- modules/stage4_target.py | 8 ++++---- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a5032fb..763550e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.236 2005/04/21 18:18:46 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.237 2005/04/22 18:33:06 rocket Exp $ + + 22 Apr 2005; Eric Edgar modules/embedded_target.py, + modules/generic_stage_target.py, modules/livecd_stage2_target.py, + modules/stage4_target.py: + Change ordering of tasks so root_overlay and fsscript occur after + livecd_update, giving users a chance to override livecd_update 21 Apr 2005; Eric Edgar catalyst, modules/catalyst_support.py, modules/generic_stage_target.py: diff --git a/modules/embedded_target.py b/modules/embedded_target.py index 43143218..d2038257 100644 --- a/modules/embedded_target.py +++ b/modules/embedded_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.11 2005/04/21 14:23:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/embedded_target.py,v 1.12 2005/04/22 18:33:06 rocket Exp $ """ This class works like a 'stage3'. A stage2 tarball is unpacked, but instead @@ -32,9 +32,11 @@ class embedded_target(generic_stage_target): def set_action_sequence(self): self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ - "config_profile_link","setup_confdir","portage_overlay","bind","chroot_setup",\ - "setup_environment","build_kernel","build_packages","bootloader","unmerge","unbind",\ - "remove","empty","clean","livecd_update","target_setup","create_iso","clear_autoresume"] + "config_profile_link","setup_confdir",\ + "portage_overlay","bind","chroot_setup",\ + "setup_environment","build_kernel","build_packages",\ + "bootloader","root_overlay","fsscript","unmerge",\ + "unbind","remove","empty","clean","capture","clear_autoresume"] def set_stage_path(self): self.settings["stage_path"]=self.settings["chroot_path"]+"/tmp/mergeroot" diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index dd8ab95f..67459cfb 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.37 2005/04/21 18:18:46 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.38 2005/04/22 18:33:06 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -974,10 +974,8 @@ class generic_stage_target(generic_target): print "Resume point detected, skipping build_packages operation..." else: try: - self.bind() cmd("/bin/bash "+self.settings["controller_file"]+" livecd-update",\ "livecd-update failed.") - self.unbind() touch(self.settings["autoresume_path"]+"livecd_update") except CatalystError: diff --git a/modules/livecd_stage2_target.py b/modules/livecd_stage2_target.py index 5bbeffb5..f6cb191f 100644 --- a/modules/livecd_stage2_target.py +++ b/modules/livecd_stage2_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.36 2005/04/21 14:23:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/livecd_stage2_target.py,v 1.37 2005/04/22 18:33:06 rocket Exp $ """ Builder class for a LiveCD stage2 build. @@ -76,9 +76,9 @@ class livecd_stage2_target(generic_stage_target): self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay",\ "bind","chroot_setup","setup_environment","run_local",\ - "root_overlay","build_kernel","bootloader","preclean",\ - "fsscript","rcupdate","unmerge","unbind","remove",\ - "empty","livecd_update","target_setup",\ + "build_kernel","bootloader","preclean","livecd_update", + "root_overlay","fsscript","rcupdate","unmerge",\ + "unbind","remove","empty","target_setup",\ "setup_overlay","create_iso","clear_autoresume"] def register(foo): diff --git a/modules/stage4_target.py b/modules/stage4_target.py index e14f2bac..d9d41a8e 100644 --- a/modules/stage4_target.py +++ b/modules/stage4_target.py @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.4 2005/04/21 14:23:11 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/stage4_target.py,v 1.5 2005/04/22 18:33:06 rocket Exp $ """ Builder class for LiveCD stage1. @@ -25,9 +25,9 @@ class stage4_target(generic_stage_target): self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ "config_profile_link","setup_confdir","portage_overlay",\ "bind","chroot_setup","setup_environment","build_packages",\ - "build_kernel","bootloader","root_overlay","preclean","rcupdate",\ - "fsscript","unmerge","unbind","remove","empty",\ - "clean","capture","livecd_update","target_setup","create_iso",\ + "build_kernel","bootloader","root_overlay","fsscript", + "preclean","rcupdate","unmerge","unbind","remove","empty",\ + "clean","capture", "livecd_update","target_setup","create_iso",\ "clear_autoresume"] def register(foo): -- 2.26.2