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

[bootloader] bootLoader GS is always empty for EFI

Browse Source 
with e15e57600e (diff-91818b0ce02fc61c3ff4b136101ee5f632a3a1febc46632dcd1dc4dc4ddc8594L801) the bootloader module will never run for EFI systems. Option to select to install or not install a bootloader is only visible on BIOS systems at this point.
Go back to only using bootLoader value for BIOS systems. This fixes https://github.com/calamares/calamares/issues/1990
This commit is contained in:
demmm 2022-06-13 11:04:00 +02:00
parent 2f3fb4a387
commit 8461571fbd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/bootloader/main.py
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")