[bootloader] make paths for executable optional and adjustable

src/modules/bootloader/bootloader.conf

@@ -21,12 +21,14 @@ timeout: "10"
 # GRUB 2 binary names and boot directory
 # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.
 # 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"
 grubMkconfig: "grub-mkconfig"
 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
 # grub-install --bootloader-id.

src/modules/bootloader/main.py

@@ -8,7 +8,7 @@
 #   Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
 #   Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr>
 #   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 2017, Alf Gaida <agaida@siduction.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)
 
     subprocess.call([
-        "/usr/sbin/efibootmgr",
+        libcalamares.job.configuration["efiBootMgr"],
         "-c",
         "-w",
         "-L", efi_bootloader_id,