From 9127b76e5f771f9b5451fc2fb52e8bc545b881b8 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 1 Feb 2022 16:49:18 +0100 Subject: [PATCH] [bootloader] Fix typo's --- src/modules/bootloader/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 81e271a71..c7bc741de 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -427,7 +427,7 @@ def efi_label(efi_directory): used within @p efi_directory. """ if "efiBootloaderId" in libcalamares.job.configuration: - efi_bootloader_id = change_efi_suffix( efi_directory, calamares.job.configuration["efiBootloaderId"] ) + efi_bootloader_id = change_efi_suffix( efi_directory, libcalamares.job.configuration["efiBootloaderId"] ) else: branding = libcalamares.globalstorage.value("branding") efi_bootloader_id = branding["bootloaderEntryName"] @@ -563,6 +563,7 @@ def run_grub_install(fw_type, partitions, efi_directory): check_target_env_call(["sh", "-c", "echo ZPOOL_VDEV_NAME_PATH=1 >> /etc/environment"]) if fw_type == "efi": + assert efi_directory is not None efi_bootloader_id = efi_label(efi_directory) efi_target, efi_grub_file, efi_boot_file = get_grub_efi_parameters() @@ -577,6 +578,7 @@ def run_grub_install(fw_type, partitions, efi_directory): "--bootloader-id=" + efi_bootloader_id, "--force"]) else: + assert efi_directory is None if libcalamares.globalstorage.value("bootLoader") is None: return @@ -653,7 +655,7 @@ def install_grub(efi_directory, fw_type): shutil.copy2(efi_file_source, efi_file_target) else: libcalamares.utils.debug("Bootloader: grub (bios)") - run_grub_install(fw_type, partitions) + run_grub_install(fw_type, partitions, None) run_grub_mkconfig(partitions, libcalamares.job.configuration["grubCfg"])