napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1628 from Conan-Kudo/fix-efi-install

Browse Source 
modules/bootloader: Use the correct names for the shim binaries
This commit is contained in:
Kevin Kofler 2021-01-31 00:52:18 +01:00 committed by GitHub
commit 2ebfae134b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -38,6 +38,7 @@ and moral support from (alphabetically by first name or nickname):
- Kevin Kofler - Kevin Kofler
- Kyle Robertze - Kyle Robertze
- Lisa Vitolo - Lisa Vitolo
- Neal Gompa
- n3rdopolis - n3rdopolis
- Philip Müller - Philip Müller
- Ramon Buldó - Ramon Buldó

7
src/modules/bootloader/main.py
View File

@ -14,6 +14,7 @@
# SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org> # SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
# SPDX-FileCopyrightText: 2017 Gabriel Craciunescu <crazy@frugalware.org> # SPDX-FileCopyrightText: 2017 Gabriel Craciunescu <crazy@frugalware.org>
# SPDX-FileCopyrightText: 2017 Ben Green <Bezzy1999@hotmail.com> # SPDX-FileCopyrightText: 2017 Ben Green <Bezzy1999@hotmail.com>
# SPDX-FileCopyrightText: 2021 Neal Gompa <ngompa13@gmail.com>
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# #
# Calamares is Free Software: see the License-Identifier above. # 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 install_efi_directory = install_path + efi_directory
if efi_word_size() == "64": if efi_word_size() == "64":
install_efi_bin = "shim64.efi" install_efi_bin = "shimx64.efi"
else: elif efi_word_size() == "32":
install_efi_bin = "shim.efi" install_efi_bin = "shimia32.efi"
# Copied, roughly, from openSUSE's install script, # Copied, roughly, from openSUSE's install script,
# and pythonified. *disk* is something like /dev/sda, # and pythonified. *disk* is something like /dev/sda,