dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

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

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