rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-27 23:34:51 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix the fallback counting script even harder. Apparently, this wasn't

Browse source 
tested well enough.
  Resolves: rhbz#1614637

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2018-10-03 15:55:57 -04:00
parent bda81f02f1
commit 8cce506787
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
0243-Fix-the-fallback-counting-script-even-harder.patch Normal file
View file

@ -0,0 +1,29 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Wed, 3 Oct 2018 15:53:18 -0400
Subject: [PATCH] Fix the fallback counting script even harder.
Apparently, this wasn't tested well enough.
Resolves: rhbz#1614637
Signed-off-by: Peter Jones <pjones@redhat.com>
---
util/grub.d/01_fallback_counting.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
index afe06199a93..31e8981887b 100644
--- a/util/grub.d/01_fallback_counting.in
+++ b/util/grub.d/01_fallback_counting.in
@@ -7,8 +7,8 @@ if [ "\${boot_counter}" -a "\${boot_success}" = "0" ]; then
set default=1
set boot_counter=-1
else
- set boot_counter=$((\${boot_counter}-1))
+ set boot_counter=\$((\${boot_counter}-1))
fi
save_env boot_counter
fi
-EOF
\ No newline at end of file
+EOF

1
grub.patches
View file

@ -240,3 +240,4 @@ Patch0239: 0239-Try-to-pick-better-locations-for-kernel-and-initrd.patch
Patch0240: 0240-grub-boot-success.timer-Add-a-few-Conditions-for-run.patch
Patch0241: 0241-docs-Stop-using-polkit-pkexec-for-grub-boot-success..patch
Patch0242: 0242-Fix-boot-counting-grub.cfg-snippet-creation.patch
Patch0243: 0243-Fix-the-fallback-counting-script-even-harder.patch

7
grub2.spec
View file

@ -7,7 +7,7 @@
Name: grub2
Epoch: 1
Version: 2.02
Release: 60%{?dist}
Release: 61%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base
License: GPLv3+
@ -494,6 +494,11 @@ fi
%endif
%changelog
* Wed Oct 03 2018 Peter Jones <pjones@redhat.com> - 2.02-61
- Fix the fallback counting script even harder. Apparently, this wasn't
tested well enough.
Resolves: rhbz#1614637
* Tue Oct 02 2018 Peter Jones <pjones@redhat.com> - 2.02-60
- Fix grub.cfg boot counting snippet generation (lorbus)
Resolves: rhbz#1614637