From 8cce506787a6827b53e594485d52ffe90e175732 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Wed, 3 Oct 2018 15:55:57 -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 --- ...fallback-counting-script-even-harder.patch | 29 +++++++++++++++++++ grub.patches | 1 + grub2.spec | 7 ++++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0243-Fix-the-fallback-counting-script-even-harder.patch diff --git a/0243-Fix-the-fallback-counting-script-even-harder.patch b/0243-Fix-the-fallback-counting-script-even-harder.patch new file mode 100644 index 0000000..a478685 --- /dev/null +++ b/0243-Fix-the-fallback-counting-script-even-harder.patch @@ -0,0 +1,29 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +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 +--- + 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 diff --git a/grub.patches b/grub.patches index 4e36cd5..1f118f7 100644 --- a/grub.patches +++ b/grub.patches @@ -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 diff --git a/grub2.spec b/grub2.spec index 1d4d6f6..cf2e90f 100644 --- a/grub2.spec +++ b/grub2.spec @@ -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 - 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 - 2.02-60 - Fix grub.cfg boot counting snippet generation (lorbus) Resolves: rhbz#1614637