Исправлено обновление liveHDD на isoscan-grub

parent 35384f060c
commit 1ed8679fee

@ -19,6 +19,7 @@ from calculate.core.server.func import Action
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
@ -54,6 +55,11 @@ 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)',
'condition': lambda Get: (
Get('os_root_type_ext') in RootType.IsoScanGrub)
},
{'name': 'grub:update_grub_menu',
'message': __("Creating the ISO images menu"),
'method': 'Builder.create_iso_grub_cfg(cl_builder_livemenu_path)',

@ -1541,6 +1541,10 @@ class VariableClBuilderFlashPath(ReadonlyVariable):
"""
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:

Loading…
Cancel
Save