Fix scratch installation

pym/cl_fill_install.py

@@ -52,7 +52,7 @@ class fillVars(object, glob_attr):
     def get_cl_install_scratch_action(self):
         """Need perform templates for install:system"""
         if self.Get('cl_action') in ('system','merge') and \
-            self.Get('os_install_scratch'):
+            self.Get('os_install_scratch') == "on":
             return "up"
         else:
             return ""

pym/cl_install.py

@@ -1441,10 +1441,6 @@ the system") + " (yes/no)"
                 targetDistr.installFrom(sourceDistr)
                 self.printByResult(True)
 
-                # optimize initrd
-                self.printMessageForTest(_("Creating new initrd file"))
-                self.printByResult(self.cleanInitrd())
-
                 # copy clt files from current system
                 self.printMessageForTest(_("Coping clt templates to new system"))
                 cltCpy = cltCopy(target=targetDistr.getDirectory())
@@ -1458,6 +1454,11 @@ the system") + " (yes/no)"
 
                 self.writeInstallVars()
                 self.printByResult(True)
+
+                # optimize initrd
+                self.printMessageForTest(_("Creating new initrd file"))
+                self.printByResult(self.cleanInitrd())
+
                 self.printMessageForTest(_("Post-install configuration"))
                 targetDistr.postinstallMountBind()
                 self.printByResult(True)