From 370bd8dd84debb172407dd87a5503a54cf4d2329 Mon Sep 17 00:00:00 2001
From: zhangqiumiao <zhangqiumiao1@huawei.com>
Date: Sat, 14 Nov 2020 14:36:18 +0800
Subject: [PATCH] remove 08_fallback_counting.in apply grubby

---
 ...08_fallback_counting.in-apply-grubby.patch | 61 +++++++++++++++++++
 grub.patches                                  |  1 +
 grub2.spec                                    |  8 ++-
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 0249-remove-08_fallback_counting.in-apply-grubby.patch

diff --git a/0249-remove-08_fallback_counting.in-apply-grubby.patch b/0249-remove-08_fallback_counting.in-apply-grubby.patch
new file mode 100644
index 0000000..48ea19c
--- /dev/null
+++ b/0249-remove-08_fallback_counting.in-apply-grubby.patch
@@ -0,0 +1,61 @@
+From f09f144a2f04bd2775367a0df0a2e7900d96d6a1 Mon Sep 17 00:00:00 2001
+From: Fedora Ninjas <grub2-owner@fedoraproject.org>
+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.patches b/grub.patches
index e6cdc00..d07b1cb 100644
--- a/grub.patches
+++ b/grub.patches
@@ -246,3 +246,4 @@ Patch0245: 0245-efi-Fix-use-after-free-in-halt-reboot-path.patch
 Patch0246: 0246-loader-linux-Avoid-overflow-on-initrd-size-calculati.patch
 Patch0247: 0247-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 Patch0248: 0248-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+Patch0249: 0249-remove-08_fallback_counting.in-apply-grubby.patch
diff --git a/grub2.spec b/grub2.spec
index 0525cd2..7df4d5a 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.04
-Release:	5
+Release:	6
 Summary:	Bootloader with support for Linux, Multiboot and more
 License:	GPLv3+
 URL:		http://www.gnu.org/software/grub/
@@ -447,6 +447,12 @@ rm -r /boot/grub2.tmp/ || :
 %{_datadir}/man/man*
 
 %changelog
+* Sat Nov 14 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-6
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:remove 08_fallback_counting.in apply grubby
+
 * Thu Oct 29 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 2.04-5
 - Type:bugfix
 - ID:NA
-- 
Gitee