diff --git a/0206-remove-08_fallback_counting.in-apply-grubby.patch b/0206-remove-08_fallback_counting.in-apply-grubby.patch new file mode 100644 index 0000000000000000000000000000000000000000..03df4a22b7f22687f4ea8ca4eae7c9e63bc84568 --- /dev/null +++ b/0206-remove-08_fallback_counting.in-apply-grubby.patch @@ -0,0 +1,61 @@ +From f09f144a2f04bd2775367a0df0a2e7900d96d6a1 Mon Sep 17 00:00:00 2001 +From: t.feng +Date: Tue, 1 Sep 2020 16:59:53 +0800 +Subject: [PATCH] remove 08_fallback_counting.in apply grubby + +--- + Makefile.util.def | 6 ------ + util/grub.d/08_fallback_counting.in | 24 ------------------------ + 2 files changed, 30 deletions(-) + delete mode 100644 util/grub.d/08_fallback_counting.in + +diff --git a/Makefile.util.def b/Makefile.util.def +index f3a6996..3473947 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -458,12 +458,6 @@ script = { + }; + + script = { +- name = '08_fallback_counting'; +- common = util/grub.d/08_fallback_counting.in; +- installdir = grubconf; +-}; +- +-script = { + name = '12_menu_auto_hide'; + common = util/grub.d/12_menu_auto_hide.in; + installdir = grubconf; +diff --git a/util/grub.d/08_fallback_counting.in b/util/grub.d/08_fallback_counting.in +deleted file mode 100644 +index 2e2c3ff..0000000 +--- a/util/grub.d/08_fallback_counting.in ++++ /dev/null +@@ -1,24 +0,0 @@ +-#! /bin/sh -e +-# Fallback Countdown +-# +-# This snippet depends on 10_reset_boot_success and needs to be kept in sync. +-# +-# The boot_counter env var can be used to count down boot attempts after an +-# OSTree upgrade and choose the rollback deployment when 0 is reached. +-# Both boot_counter=X and boot_success=1 need to be set from userspace. +-cat << EOF +-insmod increment +-# Check if boot_counter exists and boot_success=0 to activate this behaviour. +-if [ -n "\${boot_counter}" -a "\${boot_success}" = "0" ]; then +- # if countdown has ended, choose to boot rollback deployment, +- # i.e. default=1 on OSTree-based systems. +- if [ "\${boot_counter}" = "0" -o "\${boot_counter}" = "-1" ]; then +- set default=1 +- set boot_counter=-1 +- # otherwise decrement boot_counter +- else +- decrement boot_counter +- fi +- save_env boot_counter +-fi +-EOF +-- +1.8.3.1 + diff --git a/grub.macros b/grub.macros index 1235c4d4dea33524ff5565f7a306bf747dd5cef8..c9997fc5ee3fa0861e504ee1d9a271f211602cd5 100644 --- a/grub.macros +++ b/grub.macros @@ -69,7 +69,7 @@ %global with_efi_arch 0 %global with_alt_efi_arch 0 %global with_legacy_arch 0 -%global with_emu_arch 1 +%global with_emu_arch 0 %global emuarch %{_arch} %global grubefiarch %{nil} %global grublegacyarch %{nil} diff --git a/grub.patches b/grub.patches index 3ac2e1cec0ee6d5758e3bea8a5107374fa9422eb..d6d06f9ff0bc5fff4be6f12d6e35d7c5fe098cc6 100644 --- a/grub.patches +++ b/grub.patches @@ -203,3 +203,4 @@ Patch0202: grub2-set-password-prompts-to-enter-the-current-pass.patch Patch0203: support-TPM2.0.patch Patch0204: use-default-timestamp.patch Patch0205: 0205-fix-setupmode-not-available-in-some-machine.patch +Patch0206: 0206-remove-08_fallback_counting.in-apply-grubby.patch diff --git a/grub2.spec b/grub2.spec index df68227e13ce4d0428ae7f7f2ce7b0ed63a01e25..e61e07bfffa8ed2a01e77543d8b9eb497c7b8475 100644 --- a/grub2.spec +++ b/grub2.spec @@ -14,7 +14,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 2 +Release: 3 Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -426,6 +426,12 @@ fi %{_datadir}/man/man* %changelog +* Thu Mar 24 2022 zhangqiumiao - 2.06-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:remove 08_fallback_counting.in apply grubby + * Tue Mar 22 2022 fengtao - 2.06-2 - Type:bugfix - CVE:NA