dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0134-Fix-boot-when-there-s-no-TPM.patch

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