forked from pool/grub2
3e026f665c
- Add safety measure to pcr snapshot by checking platform and tpm status * safe_tpm_pcr_snapshot.patch - Fix installation failure due to unavailable nvram device on ppc64le (bsc#1201361) * 0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch - Add patches to dynamically allocate additional memory regions for EFI systems (bsc#1202438) * 0001-mm-Allow-dynamically-requesting-additional-memory-re.patch * 0002-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch * 0003-kern-efi-mm-Extract-function-to-add-memory-regions.patch * 0004-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch * 0005-kern-efi-mm-Implement-runtime-addition-of-pages.patch - Enlarge the default heap size and defer the disk cache invalidation (bsc#1202438) * 0001-kern-efi-mm-Enlarge-the-default-heap-size.patch * 0002-mm-Defer-the-disk-cache-invalidation.patch - Add patches for ALP FDE support * 0001-devmapper-getroot-Have-devmapper-recognize-LUKS2.patch * 0002-devmapper-getroot-Set-up-cheated-LUKS2-cryptodisk-mo.patch * 0003-disk-cryptodisk-When-cheatmounting-use-the-sector-in.patch * 0004-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch * 0005-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch * 0006-EFI-console-Do-not-set-colorstate-until-the-first-te.patch * 0007-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch * 0008-linuxefi-Use-common-grub_initrd_load.patch * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch * 0010-templates-import-etc-crypttab-to-grub.cfg.patch OBS-URL: https://build.opensuse.org/request/show/1004537 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=419
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
Index: grub-2.06/include/grub/efi/efi.h
|
|
===================================================================
|
|
--- grub-2.06.orig/include/grub/efi/efi.h
|
|
+++ grub-2.06/include/grub/efi/efi.h
|
|
@@ -86,6 +86,11 @@ grub_efi_status_t EXPORT_FUNC (grub_efi_
|
|
const grub_efi_guid_t *guid,
|
|
grub_size_t *datasize_out,
|
|
void **data_out);
|
|
+grub_err_t EXPORT_FUNC (grub_efi_set_variable_with_attributes) (const char *var,
|
|
+ const grub_efi_guid_t *guid,
|
|
+ grub_efi_uint32_t attributes,
|
|
+ void *data,
|
|
+ grub_size_t datasize);
|
|
grub_err_t
|
|
EXPORT_FUNC (grub_efi_set_variable) (const char *var,
|
|
const grub_efi_guid_t *guid,
|
|
Index: grub-2.06/grub-core/kern/efi/efi.c
|
|
===================================================================
|
|
--- grub-2.06.orig/grub-core/kern/efi/efi.c
|
|
+++ grub-2.06/grub-core/kern/efi/efi.c
|
|
@@ -196,6 +196,17 @@ grub_err_t
|
|
grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
|
|
void *data, grub_size_t datasize)
|
|
{
|
|
+ return grub_efi_set_variable_with_attributes(var, guid,
|
|
+ (GRUB_EFI_VARIABLE_NON_VOLATILE
|
|
+ | GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS
|
|
+ | GRUB_EFI_VARIABLE_RUNTIME_ACCESS),
|
|
+ data, datasize);
|
|
+}
|
|
+
|
|
+grub_err_t
|
|
+grub_efi_set_variable_with_attributes(const char *var, const grub_efi_guid_t *guid, grub_efi_uint32_t attributes,
|
|
+ void *data, grub_size_t datasize)
|
|
+{
|
|
grub_efi_status_t status;
|
|
grub_efi_runtime_services_t *r;
|
|
grub_efi_char16_t *var16;
|
|
@@ -211,10 +222,8 @@ grub_efi_set_variable(const char *var, c
|
|
|
|
r = grub_efi_system_table->runtime_services;
|
|
|
|
- status = efi_call_5 (r->set_variable, var16, guid,
|
|
- (GRUB_EFI_VARIABLE_NON_VOLATILE
|
|
- | GRUB_EFI_VARIABLE_BOOTSERVICE_ACCESS
|
|
- | GRUB_EFI_VARIABLE_RUNTIME_ACCESS),
|
|
+ status = efi_call_5 (r->set_variable, var16, guid,
|
|
+ attributes,
|
|
datasize, data);
|
|
grub_free (var16);
|
|
if (status == GRUB_EFI_SUCCESS)
|