From 8461571fbdf0fb6bfeb93194f0331b4584738d31 Mon Sep 17 00:00:00 2001 From: demmm Date: Mon, 13 Jun 2022 11:04:00 +0200 Subject: [PATCH] [bootloader] bootLoader GS is always empty for EFI with https://github.com/calamares/calamares/commit/e15e57600e3df46ea2a14fff6a807fa354553ae1#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 --- src/modules/bootloader/main.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index cc22746dd..dd4b41823 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -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")