From e56bdd019f8eca7e37319f86d2db4a6510a41fb6 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 30 Jan 2021 05:37:41 -0500 Subject: [PATCH] modules/bootloader: Use the correct names for the shim binaries Ever since signed shim binaries for multiple architectures became available, the shim binaries installed in Linux distributions have been renamed to include the EFI architecture in the binary names. This started in Fedora, but is now used in openSUSE and Ubuntu too. Reference for shim binary names comes from shim spec in Fedora: https://src.fedoraproject.org/rpms/shim/blob/d8c3c8e39235507feb17b4e81851da087ae83c77/f/shim.spec#_23-32 --- AUTHORS | 1 + src/modules/bootloader/main.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AUTHORS b/AUTHORS index 912d48da7..1c4d7aa24 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,6 +38,7 @@ and moral support from (alphabetically by first name or nickname): - Kevin Kofler - Kyle Robertze - Lisa Vitolo + - Neal Gompa - n3rdopolis - Philip Müller - Ramon Buldó diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index ec9a6f2e6..03fdb0c5b 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -14,6 +14,7 @@ # SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot # SPDX-FileCopyrightText: 2017 Gabriel Craciunescu # SPDX-FileCopyrightText: 2017 Ben Green +# SPDX-FileCopyrightText: 2021 Neal Gompa # SPDX-License-Identifier: GPL-3.0-or-later # # Calamares is Free Software: see the License-Identifier above. @@ -372,9 +373,9 @@ def install_secureboot(efi_directory): install_efi_directory = install_path + efi_directory if efi_word_size() == "64": - install_efi_bin = "shim64.efi" - else: - install_efi_bin = "shim.efi" + install_efi_bin = "shimx64.efi" + elif efi_word_size() == "32": + install_efi_bin = "shimia32.efi" # Copied, roughly, from openSUSE's install script, # and pythonified. *disk* is something like /dev/sda,