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

[bootloader] factor our EFI-platform-bitness discovery

Browse Source
This commit is contained in:
Adriaan de Groot 2018-05-28 09:24:43 -04:00
parent cbd62fbeb1
commit e4bda546cf
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,18 @@ def efi_label():
return efi_bootloader_id.translate(file_name_sanitizer) return efi_bootloader_id.translate(file_name_sanitizer)
def efi_word_size():
# get bitness of the underlying UEFI
try:
sysfile = open("/sys/firmware/efi/fw_platform_size", "r")
efi_bitness = sysfile.read(2)
except Exception:
# if the kernel is older than 4.0, the UEFI bitness likely isn't
# exposed to the userspace so we assume a 64 bit UEFI here
efi_bitness = "64"
return efi_bitness
def install_systemd_boot(efi_directory): def install_systemd_boot(efi_directory):
""" """
Installs systemd-boot as bootloader for EFI setups. Installs systemd-boot as bootloader for EFI setups.
@ -231,15 +243,7 @@ def install_grub(efi_directory, fw_type):
os.makedirs(install_efi_directory) os.makedirs(install_efi_directory)
efi_bootloader_id = efi_label() efi_bootloader_id = efi_label()
efi_bitness = efi_word_size()
# get bitness of the underlying UEFI
try:
sysfile = open("/sys/firmware/efi/fw_platform_size", "r")
efi_bitness = sysfile.read(2)
except Exception:
# if the kernel is older than 4.0, the UEFI bitness likely isn't
# exposed to the userspace so we assume a 64 bit UEFI here
efi_bitness = "64"
if efi_bitness == "32": if efi_bitness == "32":
efi_target = "i386-efi" efi_target = "i386-efi"