From dad3669eaee1c5ec5f7fbc11497fa397d5776425 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 28 May 2018 09:26:20 -0400
Subject: [PATCH] [bootloader] Take a stab at determining the shim name

---
 src/modules/bootloader/main.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 9103bfbe2..a09f49868 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -314,6 +314,15 @@ def install_secureboot(efi_directory):
     Installs the secureboot shim in the system by calling efibootmgr.
     """
     efi_bootloader_id = efi_label()
+
+    install_path = libcalamares.globalstorage.value("rootMountPoint")
+    install_efi_directory = install_path + efi_directory
+
+    if efi_word_size() == "64":
+        install_efi_bin = "shim64.efi"
+    else:
+        install_efi_bin = "shim.efi"
+
     subprocess.call([
         "/usr/sbin/efibootmgr",
         "-c",
@@ -321,8 +330,7 @@ def install_secureboot(efi_directory):
         "-L", efi_bootloader_id,
         "-d", path,  # TODO
         "-p", num,   # TODO
-        "-l", efidir)# TODO
-
+        "-l", install_efi_directory + "/" + install_efi_bin])
 
 
 def vfat_correct_case(parent, name):