Исправлена генерация меню на iso

pym/builder/builder.py

@@ -976,6 +976,9 @@ class Builder(Update):
             root_path = path.relpath(dn, d)
             self.clVars.Set('cl_builder_iso_path', dn, force=True)
             self.clVars.Set('cl_builder_target', iso, force=True)
+            self.clVars.Set('cl_builder_path', d, force=True)
+            self.clVars.getInfo('cl_builder_videodrv_set').autodetect = True
+            self.clVars.Invalidate('cl_builder_videodrv_set', force=True)
             self.applyTemplates(d, False, False, root_path)
         return True
 

pym/builder/variables/images.py

@@ -87,18 +87,6 @@ class DataVarsBuilderImage(LinuxDataVars):
         self['cl_builder_path'] = self.systemRoot
         return True
 
-class VariableClBuilderLiveBasePath(ReadonlyVariable):
-    """
-    Путь, куда подключена flash
-    """
-    value = "/run/initramfs/live"
-
-class VariableClBuilderImagePath(ReadonlyVariable):
-    """
-    Путь до iso образов
-    """
-    def get(self):
-        return path.join(self.Get('cl_builder_live_base_path'), "iso")
 
 class VariableClBuilderImageBootparam(Variable):
     """
@@ -143,7 +131,7 @@ class VariableClBuilderImageData(ReadonlyTableVariable):
 
     def generator(self, isopath):
         n = 1
-        numbered = re.compile(r"^.*-(\d+)-(?:x86_64|i686)\.iso$")
+        numbered = re.compile(r"^.*-(\d{1,3})-(?:x86_64|i686)\.iso$")
         for iso_image in sorted(
                 [x for x in listDirectory(isopath, fullPath=True)
                  if x.endswith('.iso')],