Добавлена обновление меню после cl-builder-image

pym/builder/utils/cl_builder_image.py

@@ -19,6 +19,7 @@ from calculate.core.server.func import Action, Tasks
 from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate
 from calculate.lib.cl_template import TemplatesError
 from calculate.lib.utils.files import FilesError
+from calculate.lib.variables.system import RootType
 from calculate.update.emerge_parser import EmergeError
 from calculate.update.update import UpdateError
 from ..datavars import BuilderError
@@ -61,6 +62,11 @@ class ClBuilderImageAction(Action):
          'method': 'Builder.iso_migrate(cl_builder_flash_path)',
          'condition': lambda Get: Get('cl_builder_rescratch_set') == 'on'
          },
+        {'name': 'remount_data',
+         'method': 'Builder.remount_rw(cl_isoscan_base_path)',
+         'condition': lambda Get: (
+             Get('os_root_type_ext') in RootType.IsoScanGrub)
+         },
         {'name': 'prepare_action',
          'method': 'Builder.set_builder_action("prepare")',
          },

pym/builder/utils/cl_builder_menu.py

@@ -55,8 +55,8 @@ class ClBuilderMenuAction(Action):
         {'name': 'grub:grub_image_menu',
          'method': 'Builder.set_builder_action("%s")' % Actions.ImageMenu,
          },
-        {'name': 'grub:mount_flash_rw',
-         'method': 'Builder.remount_rw(cl_builder_flash_path)',
+        {'name': 'grub:mount_data_rw',
+         'method': 'Builder.remount_rw(cl_isoscan_base_path)',
          'condition': lambda Get: (
              Get('os_root_type_ext') in RootType.IsoScanGrub)
          },

pym/builder/variables/builder.py

@@ -790,10 +790,17 @@ class VariableClBuilderImageFilename(Variable):
         base_dn = self.Get('cl_builder_image_path')
 
         if build_id:
-            if self.Get('os_root_type_ext') in RootType.RebuildAvailable:
+            root_type_ext = self.Get('os_root_type_ext')
+            if root_type_ext in RootType.RebuildAvailable:
                 base_dn = self.Get('cl_builder_flash_repository')
                 addon_dn = base_dn.replace("/linux", "/iso")
                 return self._isoname(base_dn, rewrite=False, addon_dn=addon_dn)
+            elif root_type_ext in RootType.IsoScanGrub:
+                base_dn = self.Get('cl_builder_livemenu_path')
+                if not base_dn:
+                    raise VariableError(
+                        _("Failed to determine the isoscan path"))
+                return self._isoname(base_dn, rewrite=False)
             else:
                 return self._isoname(base_dn, rewrite=False)
         return ""
@@ -806,8 +813,11 @@ class VariableClBuilderIsoBasePath(Variable):
     default_value = "/var/calculate/tmp"
 
     def get(self):
-        if self.Get('os_root_type_ext') in RootType.RebuildAvailable:
+        root_type_ext = self.Get('os_root_type_ext')
+        if root_type_ext in RootType.RebuildAvailable:
             return path.join(self.Get('cl_builder_flash_path'), "tmp")
+        if root_type_ext in RootType.IsoScanGrub:
+            return path.join(self.Get('cl_isoscan_base_path'), "tmp")
         return self.default_value
 
 
@@ -1426,7 +1436,7 @@ class VariableClBuilderLivemenuPath(Variable):
         elif root_type_ext in RootType.IsoScanGrub:
             grub_rep = self.get_isoscan_grub_repository()
             if grub_rep:
-                yield (Dracut.IsoScanPath, _("HDD Grub"))
+                yield (grub_rep, _("HDD Grub"))
         elif root_type_ext in RootType.Grubable:
             live_path = self.get_live_path()
             if live_path:
@@ -1534,17 +1544,12 @@ class VariableClBuilderFlashDev(ReadonlyVariable):
                 return ""
         return ""
 
-
 class VariableClBuilderFlashPath(ReadonlyVariable):
     """
     Путь, куда подключена flash (загрузка либо с флешки, либо с iso)
     """
 
     def get(self):
-        typemenu = self.Get('cl_builder_livemenu_type')
-        root_type_ext = self.Get('os_root_type_ext')
-        if root_type_ext in RootType.IsoScanGrub and typemenu == "grub":
-            return Dracut.IsoScanPath
         try:
             iso = self.Get('cl_builder_flash_dev')
             if iso: