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

[bootloader] Log when the bootloader-module does nothing

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-19 16:47:53 +02:00
parent 333f0d9215
commit dd5c0d1629
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,8 +435,8 @@ def run():
fw_type = libcalamares.globalstorage.value("firmwareType") fw_type = libcalamares.globalstorage.value("firmwareType")
if (libcalamares.globalstorage.value("bootLoader") is None if (libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi"):
and fw_type != "efi"): libcalamares.utils.warning( "Non-EFI system, and no bootloader is set." )
return None return None
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
@ -444,6 +444,7 @@ def run():
efi_system_partition = libcalamares.globalstorage.value("efiSystemPartition") efi_system_partition = libcalamares.globalstorage.value("efiSystemPartition")
esp_found = [ p for p in partitions if p["mountPoint"] == efi_system_partition ] esp_found = [ p for p in partitions if p["mountPoint"] == efi_system_partition ]
if not esp_found: if not esp_found:
libcalamares.utils.warning( "EFI system, but nothing mounted on {!s}".format(efi_system_partition) )
return None return None
prepare_bootloader(fw_type) prepare_bootloader(fw_type)