From 0254962f6185fcb125cc564843fc412df2dd9231 Mon Sep 17 00:00:00 2001 From: Qiumiao Zhang Date: Sun, 18 Jun 2023 15:54:38 +0800 Subject: [PATCH] tpcm: modify GRUB_IPMI_TIMEOUT_MS from 7000 to 2000 Signed-off-by: Qiumiao Zhang --- grub.patches | 1 + grub2.spec | 8 +++++- ...UB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch | 26 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tpcm-modify-GRUB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch diff --git a/grub.patches b/grub.patches index d2e8dd2..c4be49b 100644 --- a/grub.patches +++ b/grub.patches @@ -449,3 +449,4 @@ Patch0448: backport-net-bootp-Fix-unchecked-return-value.patch Patch0449: backport-osdep-linux-hostdisk-Modify-sector-by-sysfs-as-disk-sector.patch Patch0450: skip-verification-when-not-loading-grub.cfg.patch Patch0451: tpcm-support-control-switch.patch +Patch0452: tpcm-modify-GRUB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch diff --git a/grub2.spec b/grub2.spec index fc25b2c..31b7201 100644 --- a/grub2.spec +++ b/grub2.spec @@ -8,7 +8,7 @@ Name: grub2 Epoch: 1 Version: 2.04 -Release: 34 +Release: 35 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -442,6 +442,12 @@ rm -r /boot/grub2.tmp/ || : %{_datadir}/man/man* %changelog +* Sun Jun 18 2023 zhangqiumiao - 1:2.04-35 +- Type:requirement +- CVE:NA +- SUG:NA +- DESC:tpcm: modify GRUB_IPMI_TIMEOUT_MS from 7000 to 2000 + * Wed Jun 14 2023 zhangqiumiao - 1:2.04-34 - Type:requirement - CVE:NA diff --git a/tpcm-modify-GRUB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch b/tpcm-modify-GRUB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch new file mode 100644 index 0000000..337bdcf --- /dev/null +++ b/tpcm-modify-GRUB_IPMI_TIMEOUT_MS-from-7000-to-2000.patch @@ -0,0 +1,26 @@ +From 77bdd46676a58e77c38efd82eee1817159ec031b Mon Sep 17 00:00:00 2001 +From: Qiumiao Zhang +Date: Sun, 18 Jun 2023 15:46:37 +0800 +Subject: [PATCH] tpcm: modify GRUB_IPMI_TIMEOUT_MS from 7000 to 2000 + +Signed-off-by: Qiumiao Zhang +--- + include/grub/efi/tpcm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/grub/efi/tpcm.h b/include/grub/efi/tpcm.h +index b0265e2..d4cf93b 100644 +--- a/include/grub/efi/tpcm.h ++++ b/include/grub/efi/tpcm.h +@@ -26,7 +26,7 @@ + #define FIRMWARE_VERSION_SIZE 32 + #define FIRMWARE_HASH_CONTENT_SIZE 32 + #define FIRMWARE_NAME_SIZE 32 +-#define GRUB_IPMI_TIMEOUT_MS 7000 ++#define GRUB_IPMI_TIMEOUT_MS 2000 + + // LUN + #define IPMI_BMC_LUN 0x00 +-- +2.33.0 + -- Gitee