rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 15:46:53 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix these stupid headers.

Browse source
This commit is contained in:
Peter Jones 2012-08-15 09:58:04 -04:00
parent 2c47e4d81a
commit f1d3c740c6
1 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
grub-2.00-no-insmod-on-sb.patch
View file

@ -1,7 +1,13 @@
commit 032fac327b8db7af06509c730934a5c70bb74122 From 7a65d7b558974c89f19afaf0d78b54dc0327f56c Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg@redhat.com> From: Matthew Garrett <mjg@redhat.com>
Date: Mon Aug 13 14:46:51 2012 -0400 Date: Wed, 15 Aug 2012 09:53:05 -0400
Subject: Don't permit insmod on secure boot Subject: [PATCH] Don't permit insmod on secure boot
---
grub-core/kern/corecmd.c | 9 +++++++++
grub-core/kern/efi/efi.c | 28 ++++++++++++++++++++++++++++
include/grub/efi/efi.h | 1 +
3 files changed, 38 insertions(+)
diff --git a/grub-core/kern/corecmd.c b/grub-core/kern/corecmd.c diff --git a/grub-core/kern/corecmd.c b/grub-core/kern/corecmd.c
index eec575c..3df9dbd 100644 index eec575c..3df9dbd 100644
@ -31,11 +37,11 @@ index eec575c..3df9dbd 100644
return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected")); return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("one argument expected"));
diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
index 02d2f9a..4bafd16 100644 index 820968f..ad7aa8d 100644
--- a/grub-core/kern/efi/efi.c --- a/grub-core/kern/efi/efi.c
+++ b/grub-core/kern/efi/efi.c +++ b/grub-core/kern/efi/efi.c
@@ -229,6 +229,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid, @@ -259,6 +259,34 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
return NULL; return grub_error (GRUB_ERR_IO, "could not set EFI variable `%s'", var);
} }
+grub_efi_boolean_t +grub_efi_boolean_t
@ -70,14 +76,17 @@ index 02d2f9a..4bafd16 100644
/* Search the mods section from the PE32/PE32+ image. This code uses /* Search the mods section from the PE32/PE32+ image. This code uses
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 1b0e7ae..153ac7a 100644 index 9370fd5..a000c38 100644
--- a/include/grub/efi/efi.h --- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h +++ b/include/grub/efi/efi.h
@@ -67,6 +67,7 @@ grub_err_t EXPORT_FUNC (grub_efi_set_virtual_address_map) (grub_efi_uintn_t memo @@ -72,6 +72,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
void *EXPORT_FUNC (grub_efi_get_variable) (const char *variable,
const grub_efi_guid_t *guid, const grub_efi_guid_t *guid,
grub_size_t *datasize_out); void *data,
grub_size_t datasize);
+grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void); +grub_efi_boolean_t EXPORT_FUNC (grub_efi_secure_boot) (void);
int int
EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1, EXPORT_FUNC (grub_efi_compare_device_paths) (const grub_efi_device_path_t *dp1,
const grub_efi_device_path_t *dp2); const grub_efi_device_path_t *dp2);
--
1.7.11.2