[grub] make efi_directory configurable

This commit is contained in:
Philip Müller 2015-02-10 18:20:01 +01:00
parent a6185027f7
commit 1e1aa8151c
2 changed files with 3 additions and 1 deletions

View File

@ -4,6 +4,8 @@
grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg"
# While some distributions require a /boot/efi or /boot/EFI directory, Arch does not.
efiDirectory: "/boot"
# Optionally set the --bootloader-id to use for EFI. If not set, this defaults
# to the bootloaderEntryName from branding.desc with problematic characters
# replaced. If an efiBootloaderId is specified here, it is taken to already be a

View File

@ -26,7 +26,7 @@ from libcalamares.utils import check_chroot_call
def install_grub(boot_loader, fw_type):
if fw_type == 'efi':
efi_directory = "/boot/efi"
efi_directory = libcalamares.job.configuration["efiDirectory"]
chroot_call(["mkdir", "-p", "{!s}".format(efi_directory)])
if "efiBootloaderId" in libcalamares.job.configuration:
efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"]