Fix squash image for rescratch.

pym/cl_fill_builder.py

@@ -315,7 +315,7 @@ class fillVars(object, varsShare):
         squashfiles = filter(lambda x:x,
                              map(Distributive.reLive.search,
                                  os.listdir(directory)))
-        curName = self.Get('cl_builder_current_squash')
+        curName = self.Get('cl_builder_old_squash')
         if squashfiles:
             return  filter(lambda x:x != curName,
                     map(lambda x:x.group(),
@@ -323,7 +323,17 @@ class fillVars(object, varsShare):
         return ""
 
     def get_cl_builder_current_squash(self):
-        """Livecd.squashfs name (may be livecd.squashfs.2 and etc)"""
+        """
+        Variable keep value of squash image which will created by squash command
+        """
+        oldSquash = self.Get('cl_builder_old_squash')
+        newNum = self.getSquashNum(Distributive.reLive.search(oldSquash))+1
+        return "livecd.squashfs.%d"%newNum
+
+    def get_cl_builder_old_squash(self):
+        """
+        Variable keep value of boot squash image
+        """
         loopValue = getCmdLineParam('loop')
         if loopValue:
             return path.basename(loopValue)

pym/cl_vars_builder.py

@@ -126,9 +126,16 @@ class Data:
     # cd size specified by name (DVD/CD)
     cl_builder_cdname = {}
 
-    # livecd.squashfs name (may be livecd.squashfs.2 and etc)
+    """
+    Variable keep value of squash image which will created by squash command
+    """
     cl_builder_current_squash = {}
 
+    """
+    Variable keep value of boot squash image
+    """
+    cl_builder_old_squash = {}
+
     # livecd.squashfs name for remove (may be livecd.squashfs.2 and etc)
     cl_builder_remove_squash = {}