30 lines
856 B
Diff
30 lines
856 B
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Matthew Garrett <mjg59@coreos.com>
|
||
|
|
Date: Wed, 23 Mar 2016 16:49:42 -0700
|
||
|
|
Subject: [PATCH] Fix boot when there's no TPM
|
||
|
|
|
||
|
|
If the firmware has TPM support but has no TPM, we're jumping to core.img
|
||
|
|
without popping the registers back onto the stack. Fix that.
|
||
|
|
|
||
|
|
(cherry picked from commit c2eee36ec08f8ed0cd25b8030276347680be4843)
|
||
|
|
---
|
||
|
|
grub-core/boot/i386/pc/boot.S | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
|
||
|
|
index c1df86dec0b..acab37369ae 100644
|
||
|
|
--- a/grub-core/boot/i386/pc/boot.S
|
||
|
|
+++ b/grub-core/boot/i386/pc/boot.S
|
||
|
|
@@ -473,9 +473,9 @@ LOCAL(copy_buffer):
|
||
|
|
movl $0x8, %edx /* PCR 8 */
|
||
|
|
int $0x1A
|
||
|
|
|
||
|
|
- popa
|
||
|
|
-#endif
|
||
|
|
boot:
|
||
|
|
+ popa
|
||
|
|
+#endif
|
||
|
|
/* boot kernel */
|
||
|
|
jmp *(LOCAL(kernel_address))
|
||
|
|
|