From 79551a59f56dfc21474881dae60dcaf223afd1c3 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Thu, 18 Apr 2019 19:32:22 +0200 Subject: [PATCH] Add 10_reset_boot_success to Makefile This was missed when the script got added. Related: rhbz#1701003 Signed-off-by: Javier Martinez Canillas --- ...dd-10_reset_boot_success-to-Makefile.patch | 29 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 6 +++- 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0298-Add-10_reset_boot_success-to-Makefile.patch diff --git a/0298-Add-10_reset_boot_success-to-Makefile.patch b/0298-Add-10_reset_boot_success-to-Makefile.patch new file mode 100644 index 0000000..541b5f1 --- /dev/null +++ b/0298-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 3ecf45f..0515914 100644 --- a/grub.patches +++ b/grub.patches @@ -295,3 +295,4 @@ Patch0294: 0294-HTTP-boot-strncmp-returns-0-on-equal.patch Patch0295: 0295-Fix-systemctl-kexec-exit-status-check.patch Patch0296: 0296-Print-grub-emu-linux-loader-messages-as-debug.patch Patch0297: 0297-Don-t-assume-that-boot-commands-will-only-return-on-.patch +Patch0298: 0298-Add-10_reset_boot_success-to-Makefile.patch diff --git a/grub2.spec b/grub2.spec index b99a0fa..214c908 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#17010 + * Thu Apr 18 2019 Javier Martinez Canillas - 2.02-77 - Never remove boot loader configuration for other boot loaders from the ESP. This would render machines with sd-boot unbootable (zbyszek)