diff --git a/plugins/uefi-capsule/fu-uefi-capsule-plugin.c b/plugins/uefi-capsule/fu-uefi-capsule-plugin.c index c56b7e566..a7688096f 100644 --- a/plugins/uefi-capsule/fu-uefi-capsule-plugin.c +++ b/plugins/uefi-capsule/fu-uefi-capsule-plugin.c @@ -436,7 +436,6 @@ static void fu_uefi_capsule_plugin_load_config(FuPlugin *plugin, FuDevice *device) { gboolean disable_shim; - gboolean fallback_removable_path; guint64 sz_reqd = 0; g_autofree gchar *require_esp_free_space = 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"); if (!disable_shim) 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 diff --git a/plugins/uefi-capsule/fu-uefi-device.c b/plugins/uefi-capsule/fu-uefi-device.c index ef6a20715..6fe78427c 100644 --- a/plugins/uefi-capsule/fu-uefi-device.c +++ b/plugins/uefi-capsule/fu-uefi-device.c @@ -758,9 +758,6 @@ fu_uefi_device_init(FuUefiDevice *self) fu_device_register_private_flag(FU_DEVICE(self), FU_UEFI_DEVICE_FLAG_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_UEFI_DEVICE_FLAG_NO_RT_SET_VARIABLE, "no-rt-set-variable"); diff --git a/plugins/uefi-capsule/fu-uefi-device.h b/plugins/uefi-capsule/fu-uefi-device.h index 977e46a66..58aefc7c8 100644 --- a/plugins/uefi-capsule/fu-uefi-device.h +++ b/plugins/uefi-capsule/fu-uefi-device.h @@ -66,12 +66,6 @@ typedef enum { * not using grub chainloading or capsule-on-disk. */ #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: * diff --git a/plugins/uefi-capsule/uefi_capsule.conf b/plugins/uefi-capsule/uefi_capsule.conf index fc1c3b417..32edc4f04 100644 --- a/plugins/uefi-capsule/uefi_capsule.conf +++ b/plugins/uefi-capsule/uefi_capsule.conf @@ -10,9 +10,5 @@ # amount of free space required on the ESP, for example using 0x2000000 for 32Mb #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 #DisableCapsuleUpdateOnDisk=true