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

fixes #692 bootloader module fails when /EFI/Boot exists

Browse Source 
- to make it short - it doesn't help much if one try to find and process any
  EFI related things in the live system. The better approach is to search in
  the chroot.
- use python builtins for mkdir and cp
- replacing some subprocess calls
- Some PEP8 changes
- added myself to the copyright section
This commit is contained in:
Alf Gaida 2017-03-16 16:59:28 +01:00
parent 30f7d724ec
commit 50cefe2ca8
1 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,6 +10,7 @@
# Copyright 2014, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2015, Philip Mueller <philm@manjaro.org> # Copyright 2015, Philip Mueller <philm@manjaro.org>
# Copyright 2016-2017, Teo Mrnjavac <teo@kde.org> # Copyright 2016-2017, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -25,6 +26,7 @@
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import os import os
import shutil
import subprocess import subprocess
import libcalamares import libcalamares
@ -51,7 +53,8 @@ def get_uuid():
def get_bootloader_entry_name(): def get_bootloader_entry_name():
""" Passes 'bootloader_entry_name' to other routine based on configuration file. """ Passes 'bootloader_entry_name' to other routine based
on configuration file.
:return: :return:
""" """
@ -118,7 +121,8 @@ def create_systemd_boot_conf(uuid, conf_path, kernel_line):
lines = [ lines = [
'## This is just an example config file.\n', '## This is just an example config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n', '## Please edit the paths and kernel parameters according\n',
'## to your system.\n',
'\n', '\n',
"title {!s}{!s}\n".format(distribution, kernel_line), "title {!s}{!s}\n".format(distribution, kernel_line),
"linux {!s}\n".format(kernel), "linux {!s}\n".format(kernel),
@ -193,9 +197,11 @@ def install_grub(efi_directory, fw_type):
""" """
if fw_type == "efi": if fw_type == "efi":
print("Bootloader: grub (efi)") print("Bootloader: grub (efi)")
install_path = libcalamares.globalstorage.value("rootMountPoint")
install_efi_directory = install_path + efi_directory
if not os.path.isdir(efi_directory): if not os.path.isdir(install_efi_directory):
check_target_env_call(["mkdir", "-p", "{!s}".format(efi_directory)]) os.mkdirs(install_efi_directory)
if "efiBootloaderId" in libcalamares.job.configuration: if "efiBootloaderId" in libcalamares.job.configuration:
efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"] efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"]
@ -212,7 +218,8 @@ def install_grub(efi_directory, fw_type):
# if the kernel is older than 4.0, the UEFI bitness likely isn't # 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 # exposed to the userspace so we assume a 64 bit UEFI here
efi_bitness = "64" efi_bitness = "64"
bitness_translate = {"32": "--target=i386-efi", "64": "--target=x86_64-efi"} bitness_translate = {"32": "--target=i386-efi",
"64": "--target=x86_64-efi"}
check_target_env_call([libcalamares.job.configuration["grubInstall"], check_target_env_call([libcalamares.job.configuration["grubInstall"],
bitness_translate[efi_bitness], bitness_translate[efi_bitness],
"--efi-directory={!s}".format(efi_directory), "--efi-directory={!s}".format(efi_directory),
@ -220,24 +227,27 @@ def install_grub(efi_directory, fw_type):
"--force"]) "--force"])
# VFAT is weird, see issue CAL-385 # VFAT is weird, see issue CAL-385
efi_directory_firmware = os.path.join(efi_directory, "EFI") install_efi_directory_firmware = \
if os.path.exists(efi_directory_firmware): vfat_correct_case(install_efi_directory, "EFI")
efi_directory_firmware = vfat_correct_case(efi_directory, "EFI") if not os.path.exists(install_efi_directory_firmware):
os.mkdirs(install_efi_directory_firmware)
efi_boot_directory = os.path.join(efi_directory_firmware, "boot") # there might be several values for the boot directory
if os.path.exists(efi_boot_directory): # most usual they are boot, Boot, BOOT
efi_boot_directory = vfat_correct_case(efi_directory_firmware, "boot")
else: install_efi_boot_directory = \
check_target_env_call(["mkdir", "-p", efi_boot_directory]) vfat_correct_case(install_efi_directory_firmware, "boot")
if not os.path.exists(install_efi_boot_directory):
os.mkdirs(install_efi_boot_directory)
# Workaround for some UEFI firmwares # Workaround for some UEFI firmwares
efi_file_source = {"32": os.path.join(efi_directory_firmware, efi_bootloader_id, "grubia32.efi"), efi_file_source = {"32": os.path.join(install_efi_directory_firmware,
"64": os.path.join(efi_directory_firmware, efi_bootloader_id, "grubx64.efi")} efi_bootloader_id,
efi_file_target = {"32": os.path.join(efi_boot_directory, "bootia32.efi"), "grubia32.efi"),
"64": os.path.join(efi_boot_directory, "bootx64.efi")} "64": os.path.join(install_efi_directory_firmware,
check_target_env_call(["cp", efi_bootloader_id,
efi_file_source[efi_bitness], "grubx64.efi")}
efi_file_target[efi_bitness]]) shutil.copy2(efi_file_source[efi_bitness], install_efi_boot_directory)
else: else:
print("Bootloader: grub (bios)") print("Bootloader: grub (bios)")
if libcalamares.globalstorage.value("bootLoader") is None: if libcalamares.globalstorage.value("bootLoader") is None:
@ -269,7 +279,8 @@ def vfat_correct_case(parent, name):
def prepare_bootloader(fw_type): def prepare_bootloader(fw_type):
""" Prepares bootloader. """ Prepares bootloader.
Based on value 'efi_boot_loader', it either calls systemd-boot or grub to be installed. Based on value 'efi_boot_loader', it either calls systemd-boot
or grub to be installed.
:param fw_type: :param fw_type:
:return: :return:
@ -291,7 +302,8 @@ def run():
fw_type = libcalamares.globalstorage.value("firmwareType") fw_type = libcalamares.globalstorage.value("firmwareType")
if libcalamares.globalstorage.value("bootLoader") is None and fw_type != "efi": if libcalamares.globalstorage.value("bootLoader") is None \
and fw_type != "efi":
return None return None
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
@ -300,7 +312,8 @@ def run():
esp_found = False esp_found = False
for partition in partitions: for partition in partitions:
if partition["mountPoint"] == libcalamares.globalstorage.value("efiSystemPartition"): if partition["mountPoint"] == \
libcalamares.globalstorage.value("efiSystemPartition"):
esp_found = True esp_found = True
if not esp_found: if not esp_found: