Change ordering of tasks so root_overlay and fsscript occur after livecd_update,...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@624 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 0a5032fb68d5ba519662bebf6580acd394e6637c..763550e6d8022abf1ce0387508e6b88d5e6c6170 100644 (file)
--- 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 <rocket@gentoo.org> 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 <rocket@gentoo.org> catalyst,
   modules/catalyst_support.py, modules/generic_stage_target.py:

diff --git a/modules/embedded_target.py b/modules/embedded_target.py
index 43143218457607bd5d5f7f78f4cf3005525ed78f..d2038257cb97466602638f4023520f79108ba868 100644 (file)
--- 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 dd8ab95f14a1f14441b34ec5dde581ea9c9b2b57..67459cfb7845c8ce0754daa6db0c289b3bb6fa3b 100644 (file)
--- 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 5bbeffb522ec5edab4ed5d0db01874aaec919305..f6cb191f4cf1e7ead1bfb92407219e011faa6ec7 100644 (file)
--- 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 e14f2bac894ccfe8d432ae90a8c27e9b141ae987..d9d41a8e30abbc409a1e1a9f29b7c5d48e003fe7 100644 (file)
--- 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):