rpms
/
grub2
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 10_reset_boot_success to Makefile 

This was missed when the script got added.

Related: rhbz#1701003

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2019-04-18 19:32:22 +02:00
parent 62a05cdcd4
commit 79551a59f5
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0298-Add-10_reset_boot_success-to-Makefile.patch Normal file
View File

@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
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 <javierm@redhat.com>
---
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;

1
grub.patches
View File

@ -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

6
grub2.spec
View File

@ -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 <javierm@redhat.com> - 2.02-78
- Add 10_reset_boot_success to Makefile
Related: rhbz#17010
* Thu Apr 18 2019 Javier Martinez Canillas <javierm@redhat.com> - 2.02-77
- Never remove boot loader configuration for other boot loaders from the ESP.
This would render machines with sd-boot unbootable (zbyszek)