proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 09:12:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

trivial: uefi-capsule: drop the fallback to removable path flag

Browse Source 
It was used for ubuntu-core with a confined fwupd, but now we will
load our own shim as necessary to the ESP.
This commit is contained in:
Mario Limonciello 2023-02-09 10:44:43 -06:00 committed by Mario Limonciello
parent 5266d62611
commit 2ddda260a6
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/uefi-capsule/fu-uefi-capsule-plugin.c
View File

@ -436,7 +436,6 @@ static void
fu_uefi_capsule_plugin_load_config(FuPlugin *plugin, FuDevice *device) fu_uefi_capsule_plugin_load_config(FuPlugin *plugin, FuDevice *device)
{ {
gboolean disable_shim; gboolean disable_shim;
gboolean fallback_removable_path;
guint64 sz_reqd = 0; guint64 sz_reqd = 0;
g_autofree gchar *require_esp_free_space = NULL; g_autofree gchar *require_esp_free_space = NULL;
g_autoptr(GError) error_local = NULL; g_autoptr(GError) error_local = NULL;
@ -454,12 +453,6 @@ fu_uefi_capsule_plugin_load_config(FuPlugin *plugin, FuDevice *device)
disable_shim = fu_plugin_get_config_value_boolean(plugin, "DisableShimForSecureBoot"); disable_shim = fu_plugin_get_config_value_boolean(plugin, "DisableShimForSecureBoot");
if (!disable_shim) if (!disable_shim)
fu_device_add_private_flag(device, FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB); fu_device_add_private_flag(device, FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB);
/* check if using UEFI removable path */
fallback_removable_path =
fu_plugin_get_config_value_boolean(plugin, "FallbacktoRemovablePath");
if (fallback_removable_path)
fu_device_add_private_flag(device, FU_UEFI_DEVICE_FLAG_FALLBACK_TO_REMOVABLE_PATH);
} }
static gboolean static gboolean

3
plugins/uefi-capsule/fu-uefi-device.c
View File

@ -758,9 +758,6 @@ fu_uefi_device_init(FuUefiDevice *self)
fu_device_register_private_flag(FU_DEVICE(self), fu_device_register_private_flag(FU_DEVICE(self),
FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB, FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB,
"use-shim-for-sb"); "use-shim-for-sb");
fu_device_register_private_flag(FU_DEVICE(self),
FU_UEFI_DEVICE_FLAG_FALLBACK_TO_REMOVABLE_PATH,
"fallback-to-removable-path");
fu_device_register_private_flag(FU_DEVICE(self), fu_device_register_private_flag(FU_DEVICE(self),
FU_UEFI_DEVICE_FLAG_NO_RT_SET_VARIABLE, FU_UEFI_DEVICE_FLAG_NO_RT_SET_VARIABLE,
"no-rt-set-variable"); "no-rt-set-variable");

6
plugins/uefi-capsule/fu-uefi-device.h
View File

@ -66,12 +66,6 @@ typedef enum {
* not using grub chainloading or capsule-on-disk. * not using grub chainloading or capsule-on-disk.
*/ */
#define FU_UEFI_DEVICE_FLAG_SUPPORTS_BOOT_ORDER_LOCK (1 << 3) #define FU_UEFI_DEVICE_FLAG_SUPPORTS_BOOT_ORDER_LOCK (1 << 3)
/**
* FU_UEFI_DEVICE_FLAG_FALLBACK_TO_REMOVABLE_PATH:
*
* Try to fallback to use UEFI removable path if the shim path doesn't exist.
*/
#define FU_UEFI_DEVICE_FLAG_FALLBACK_TO_REMOVABLE_PATH (1 << 4)
/** /**
* FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB: * FU_UEFI_DEVICE_FLAG_USE_SHIM_FOR_SB:
* *

4
plugins/uefi-capsule/uefi_capsule.conf
View File

@ -10,9 +10,5 @@
# amount of free space required on the ESP, for example using 0x2000000 for 32Mb # amount of free space required on the ESP, for example using 0x2000000 for 32Mb
#RequireESPFreeSpace= #RequireESPFreeSpace=
# with the UEFI removable path enabled, the default esp path is set to /EFI/boot
# the shim EFI binary and presumably this is $ESP/EFI/boot/bootx64.efi
#FallbacktoRemovablePath=false
# allow ignoring the CapsuleOnDisk support advertised by the firmware # allow ignoring the CapsuleOnDisk support advertised by the firmware
#DisableCapsuleUpdateOnDisk=true #DisableCapsuleUpdateOnDisk=true