From e95ccc7ba603301637dc95fcc29d916624d9fcf0 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Apr 18 2019 17:25:57 +0000 Subject: Add 10_reset_boot_success to Makefile This was missed when the script got added. Related: rhbz#1701003 Signed-off-by: Javier Martinez Canillas --- diff --git a/0291-Add-10_reset_boot_success-to-Makefile.patch b/0291-Add-10_reset_boot_success-to-Makefile.patch new file mode 100644 index 0000000..541b5f1 --- /dev/null +++ b/0291-Add-10_reset_boot_success-to-Makefile.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Javier Martinez Canillas +Date: Thu, 18 Apr 2019 19:16:18 +0200 +Subject: [PATCH] Add 10_reset_boot_success to Makefile + +This was missing in a previous commit that added this script. + +Signed-off-by: Javier Martinez Canillas +--- + Makefile.util.def | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/Makefile.util.def b/Makefile.util.def +index cae6002d2e3..5062a0e50fa 100644 +--- a/Makefile.util.def ++++ b/Makefile.util.def +@@ -515,6 +515,12 @@ script = { + condition = COND_HOST_LINUX; + }; + ++script = { ++ name = '10_reset_boot_success'; ++ common = util/grub.d/10_reset_boot_success.in; ++ installdir = grubconf; ++}; ++ + script = { + name = '10_xnu'; + common = util/grub.d/10_xnu.in; diff --git a/grub.patches b/grub.patches index 7cf2523..631a81d 100644 --- a/grub.patches +++ b/grub.patches @@ -288,3 +288,4 @@ Patch0287: 0287-blscfg-don-t-use-grub_list_t-and-the-GRUB_AS_LIST-ma.patch Patch0288: 0288-10_linux_bls-don-t-add-users-option-to-generated-men.patch Patch0289: 0289-grub.d-Split-out-boot-success-reset-from-menu-auto-h.patch Patch0290: 0290-HTTP-boot-strncmp-returns-0-on-equal.patch +Patch0291: 0291-Add-10_reset_boot_success-to-Makefile.patch diff --git a/grub2.spec b/grub2.spec index b440744..19972ef 100644 --- a/grub2.spec +++ b/grub2.spec @@ -7,7 +7,7 @@ Name: grub2 Epoch: 1 Version: 2.02 -Release: 77%{?dist} +Release: 78%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -476,6 +476,10 @@ rm -r /boot/grub2.tmp/ || : %endif %changelog +* Thu Apr 18 2019 Javier Martinez Canillas - 2.02-78 +- Add 10_reset_boot_success to Makefile + Related: rhbz#1701003 + * Thu Apr 18 2019 Javier Martinez Canillas - 2.02-77 - grub.d: Split out boot success reset from menu auto hide script (lorbus) Resolves: rhbz#1701003