napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bootloader] improve efi check and don't fail if install path is null

Browse Source
This commit is contained in:
Philip 2017-01-23 15:29:49 +01:00
parent a57b08c200
commit 87e4e3c4a0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/bootloader/main.py
View File

@ -240,7 +240,13 @@ def install_grub(efi_directory, fw_type):
efi_file_target[efi_bitness]]) efi_file_target[efi_bitness]])
else: else:
print("Bootloader: grub (bios)") print("Bootloader: grub (bios)")
if libcalamares.globalstorage.value("bootLoader") is None:
return
boot_loader = libcalamares.globalstorage.value("bootLoader") boot_loader = libcalamares.globalstorage.value("bootLoader")
if boot_loader["installPath"] is None:
return
check_target_env_call([libcalamares.job.configuration["grubInstall"], check_target_env_call([libcalamares.job.configuration["grubInstall"],
"--target=i386-pc", "--target=i386-pc",
"--recheck", "--recheck",
@ -282,10 +288,12 @@ def run():
:return: :return:
""" """
if libcalamares.globalstorage.value("bootLoader") is None:
return None
fw_type = libcalamares.globalstorage.value("firmwareType") fw_type = libcalamares.globalstorage.value("firmwareType")
if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi":
return None
prepare_bootloader(fw_type) prepare_bootloader(fw_type)
return None return None