Merge pull request #1991 from demmm/calamares

[bootloader] bootLoader GS is always empty for EFI
This commit is contained in:
dalto8 2022-06-13 14:44:21 +00:00 committed by GitHub
commit 9cfbb4106b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -798,12 +798,8 @@ def run():
fw_type = libcalamares.globalstorage.value("firmwareType")
if libcalamares.globalstorage.value("bootLoader") is None:
# Don't want a bootloader, but do log that this has an effect:
if fw_type != "efi":
libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
else:
libcalamares.utils.warning( "EFI system, and no bootloader is set." )
if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"):
libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
return None
partitions = libcalamares.globalstorage.value("partitions")