SHA256
1
0
forked from pool/fwupd
fwupd/fwupd-bsc1130056-change-shim-path.patch
Marcus Meissner cbadc65b98 Accepting request 711904 from home:pluskalm:branches:Base:System
- Update to version 1.2.9:
  * Release fwupd 1.2.9
  * trivial: Add two new translatable strings for new category types
  * Check if the system is offline during install, rather than at startup
  * Prompt the user to shutdown if requried when installing by ID
  * Use the correct file extension for the offline updates cache
  * trivial: Allow using --force to use the wrong daemon version
  * trivial: Display the correct expected command
  * standalone-installer: Be smarter about existing installed fwupd
  * Add a plugin to update Synaptics Prometheus fingerprint readers
  * trivial: standalone-installer: rename uninstall argument to cleanup
  * fu-util: Check the daemon version is at least the client version
  * fu-util: Check that daemon is started by expected unit
  * fu-util-common: when stopping a daemon, check for snap too
  * Allow using --force to trigger a duplicate offline update
  * trivial: Allow using FuUsbDevice without a GUsbDevice
  * trivial: Copy the icons if unset for the device child
  * trivial: Copy the physical ID if unset for the device child
  * trivial: Ensure the parent ID is up to date if the device ID changes
  * trivial: Fix typo when setting the parent ID
  * trivial: Disable the flatpak CI build
  * Allow handling FORCE for devices that subclass FuDevice
  * uefi: Fix a libasan failure when reading a UEFI variable
  * trivial: Fix a memory leak found using libasan
  * trivial: Fix an libasan failure in the dell plugin
  * trivial: Fix some dead code spotted by coverity
  * trivial: Fix a typo spotted by coverity
  * trivial: Fix a missing config.h include in a new source file
  * Dynamically read path to use for /system-update
  * Display the remote warning on the console in an easy-to-read way

OBS-URL: https://build.opensuse.org/request/show/711904
OBS-URL: https://build.opensuse.org/package/show/Base:System/fwupd?expand=0&rev=53
2019-06-25 15:32:29 +00:00

27 lines
985 B
Diff

From f8bbcefe3eed253cda0c86a4c2443292beca82ee Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Thu, 28 Mar 2019 15:26:28 +0800
Subject: [PATCH] Change the path to shim.efi
For openSUSE/SLE, we use shim.efi instead of shimx64.efi.
Signed-off-by: Gary Lin <glin@suse.com>
---
plugins/uefi/fu-uefi-bootmgr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: fwupd-1.2.9/plugins/uefi/fu-uefi-bootmgr.c
===================================================================
--- fwupd-1.2.9.orig/plugins/uefi/fu-uefi-bootmgr.c
+++ fwupd-1.2.9/plugins/uefi/fu-uefi-bootmgr.c
@@ -324,7 +324,8 @@ fu_uefi_bootmgr_bootnext (const gchar *e
return FALSE;
/* test to make sure shim is there if we need it */
- shim_app = fu_uefi_get_esp_app_path (esp_path, "shim", error);
+ shim_app = g_strdup_printf ("%s/shim.efi",
+ fu_uefi_get_esp_path_for_os (esp_path));
if (shim_app == NULL)
return FALSE;
if (g_file_test (shim_app, G_FILE_TEST_EXISTS)) {