Let's see if we can update the seed stage and fix bug 397505.

diff --git a/modules/stage1_target.py b/modules/stage1_target.py
index ea29bb0a47f01175bd1f449bc241c1800ff1d9a4..773e3c8900ca049b4dfc77bd1b3bbbbc5832f4ac 100644 (file)
--- a/modules/stage1_target.py
+++ b/modules/stage1_target.py
@@ -13,7 +13,9 @@ class stage1_target(generic_stage_target):
        def __init__(self,spec,addlargs):
                self.required_values=[]
                self.valid_values=["chost"]
+               self.valid_values.extend(["update_seed"])
                generic_stage_target.__init__(self,spec,addlargs)
+        self.set_update_seed()
        
        def set_stage_path(self):
                self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"])
@@ -95,6 +97,9 @@ class stage1_target(generic_stage_target):
                self.mounts.append("/tmp/stage1root/proc")
                self.mountmap["/tmp/stage1root/proc"]="/proc"
 
+       def set_update_seed(self):
+               if self.settings.has_key(self.settings["update_seed"]):
+                       self.settings["update_seed_cache"]=self.settings["update_seed"]
 
 def register(foo):
        foo.update({"stage1":stage1_target})

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 00f390d80b51401c1929a8643ca7c471c717e457..641f5c39272032e2c2fe1e480a2524908138fa1c 100644 (file)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -25,7 +25,7 @@ fi
 run_merge "--oneshot --nodeps sys-apps/baselayout"
 
 # Update stage3
-UPDATE_SEED_STAGE="yes"
+#UPDATE_SEED_STAGE="yes"
 if [ -n ${UPDATE_SEED_STAGE} ]; then
        echo "Updating seed stage..."
        clst_root_path=/ run_merge "--update --deep --newuse @world"