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

[bootloader] make paths for executable optional and adjustable

Browse Source
This commit is contained in:
Philip Müller 2018-06-17 07:47:58 +02:00
parent 25533c4dce
commit 18bd455ae1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/bootloader/bootloader.conf
View File

@ -21,12 +21,14 @@ timeout: "10"
# GRUB 2 binary names and boot directory # GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
# These names are also used when using sb-shim, since that needs some # These names are also used when using sb-shim, since that needs some
# GRUB functionality (notably grub-probe) to work. # GRUB functionality (notably grub-probe) to work. As needed, you may use
# complete paths like `/usr/bin/efibootmgr` for the executables.
# #
grubInstall: "grub-install" grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig" grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg" grubCfg: "/boot/grub/grub.cfg"
grubProbe: "/usr/sbin/grub2-probe" grubProbe: "grub-probe"
efiBootMgr: "efibootmgr"
# Optionally set the bootloader ID to use for EFI. This is passed to # Optionally set the bootloader ID to use for EFI. This is passed to
# grub-install --bootloader-id. # grub-install --bootloader-id.

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

@ -8,7 +8,7 @@
# Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org> # Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
# Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr> # Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr>
# Copyright 2014, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2014, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2015-2017, Philip Mueller <philm@manjaro.org> # Copyright 2015-2018, 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> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017-2018, Adriaan de Groot <groot@kde.org> # Copyright 2017-2018, Adriaan de Groot <groot@kde.org>
@ -351,7 +351,7 @@ def install_secureboot(efi_directory):
raise ValueError("No partition number found for %s" % install_efi_directory) raise ValueError("No partition number found for %s" % install_efi_directory)
subprocess.call([ subprocess.call([
"/usr/sbin/efibootmgr", libcalamares.job.configuration["efiBootMgr"],
"-c", "-c",
"-w", "-w",
"-L", efi_bootloader_id, "-L", efi_bootloader_id,