[grub] make efiDirectory(Firmware) hard-coded

- until we find a better solution
- efiDirectory should be managed by GlobalStorage
- efiDirectory is needed followed modules: bootloader, grub, partition

src/modules/grub/grub.conf

@@ -4,10 +4,6 @@
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
-# Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
-# These values need to be in-sync with partition.conf
-efiDirectory: "/boot"
-efiDirectoryFirmware: "/boot/EFI"
 # 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

src/modules/grub/main.py

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

src/modules/partition/partition.conf

@@ -1,5 +0,0 @@
----
-# Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
-# These values need to be in-sync with grub.conf
-efiDirectory: "/boot"
-efiDirectoryFirmware: "/boot/EFI"