Tree - rpms/grub2 - src.fedoraproject.org

Blob History Raw

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