|
|
|
@ -344,7 +344,6 @@ class Install(MethodsInterface):
|
|
|
|
|
else:
|
|
|
|
|
labels = ["calculate"]
|
|
|
|
|
for efiname, efidir in reversed(zip(labels, efidirs)):
|
|
|
|
|
efidir = pathJoin(target.getDirectory(), efidir)
|
|
|
|
|
self._install_grub_uefi(cmd_grub_install, prefix_boot, target,
|
|
|
|
|
efidir, efiname)
|
|
|
|
|
# удаляем устаревшие
|
|
|
|
@ -360,19 +359,20 @@ class Install(MethodsInterface):
|
|
|
|
|
"""
|
|
|
|
|
Установить grub с UEFI загрузчиком
|
|
|
|
|
"""
|
|
|
|
|
efifulldir = pathJoin(target.getDirectory(), efidir)
|
|
|
|
|
grub_params = [
|
|
|
|
|
"--boot-directory=%s" % pathJoin(
|
|
|
|
|
prefix_boot,
|
|
|
|
|
target.getBootDirectory()),
|
|
|
|
|
"--bootloader-id=%s" % efiname,
|
|
|
|
|
"--target=x86_64-efi",
|
|
|
|
|
"--efi-directory=%s" % efidir,
|
|
|
|
|
"--efi-directory=%s" % efifulldir,
|
|
|
|
|
"--force"]
|
|
|
|
|
# проверяем наличие в nv-ram нужной нам записи для исключения повтора
|
|
|
|
|
efi_boot_mgr = getProgPath('/usr/sbin/efibootmgr')
|
|
|
|
|
efi_disk = self.clVars.Select("os_install_disk_dev",
|
|
|
|
|
where="os_install_disk_mount",
|
|
|
|
|
eq="/boot/efi", limit=1)
|
|
|
|
|
eq=efidir, limit=1)
|
|
|
|
|
if efi_disk:
|
|
|
|
|
efi_uuid = device.udev.get_device_info(
|
|
|
|
|
name=efi_disk).get("ID_PART_ENTRY_UUID", "")
|
|
|
|
|