integ/grub/grub2/centos/meta_patches/0010-Don-t-add-a-trailing-c...

44 lines
1.6 KiB
Diff

From d3bc2d9e09b1fff838e30eb064c5c73d201e47c5 Mon Sep 17 00:00:00 2001
Message-Id: <d3bc2d9e09b1fff838e30eb064c5c73d201e47c5.1643237526.git.Jim.Somerville@windriver.com>
In-Reply-To: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
References: <8b5576704440696a7c8f1b00735217bf1745b6a1.1643237526.git.Jim.Somerville@windriver.com>
From: jmckenna <jason.mckenna@windriver.com>
Date: Wed, 28 Mar 2018 14:08:57 -0400
Subject: [PATCH 10/13] Don't add a trailing colon after MAC
A CentOS GRUB patch added support for macs > 6B in size. This
breaks PXEbooting the installer, because a routine within grub
relies on the max MAC string length.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SOURCES/grub.macros | 2 +-
SOURCES/grub.patches | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index b279e7d..00c669f 100644
--- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros
@@ -82,7 +82,7 @@
%global legacy_package_arch pc
%global platform pc
-%global wrs_modules " multiboot multiboot2"
+%global wrs_modules " multiboot multiboot2 regexp"
%else
%global wrs_modules ""
diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index ba47129..3d4f708 100644
--- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches
@@ -334,3 +334,4 @@ Patch0333: 0333-linuxefi-fail-kernel-validation-without-shim-protoco.patch
Patch0334: 0334-linux-Fix-integer-overflows-in-initrd-size-handling.patch
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
Patch1001: 1001-add-tboot.patch
+Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch
--
2.29.2