Fix grub.cfg boot counting snippet generation (lorbus)

Resolves: rhbz#1614637

Signed-off-by: Peter Jones <pjones@redhat.com>

0242-Fix-boot-counting-grub.cfg-snippet-creation.patch

@@ -0,0 +1,27 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Christian Glombek <lorbus@fedoraproject.org>
+Date: Tue, 2 Oct 2018 15:41:18 +0200
+Subject: [PATCH] Fix boot counting grub.cfg snippet creation Fixes BZ1614637
+
+---
+ util/grub.d/01_fallback_counting.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
+index ecfc7401474..afe06199a93 100644
+--- a/util/grub.d/01_fallback_counting.in
++++ b/util/grub.d/01_fallback_counting.in
+@@ -1,6 +1,7 @@
+ #! /bin/sh -e
+ 
+ # Boot Counting
++cat << EOF
+ if [ "\${boot_counter}" -a "\${boot_success}" = "0" ]; then
+   if  [ "\${boot_counter}" = "0" -o "\${boot_counter}" = "-1" ]; then
+     set default=1
+@@ -10,3 +11,4 @@ if [ "\${boot_counter}" -a "\${boot_success}" = "0" ]; then
+   fi
+   save_env boot_counter
+ fi
++EOF
+\ No newline at end of file

grub.patches

@@ -239,3 +239,4 @@ Patch0238: 0238-arm-arm64-loader-Better-memory-allocation-and-error-.patch
 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

grub2.spec

@@ -7,7 +7,7 @@
 Name:		grub2
 Epoch:		1
 Version:	2.02
-Release:	59%{?dist}
+Release:	60%{?dist}
 Summary:	Bootloader with support for Linux, Multiboot and more
 Group:		System Environment/Base
 License:	GPLv3+
@@ -494,6 +494,10 @@ fi
 %endif
 
 %changelog
+* Tue Oct 02 2018 Peter Jones <pjones@redhat.com> - 2.02-60
+- Fix grub.cfg boot counting snippet generation (lorbus)
+  Resolves: rhbz#1614637
+
 * Fri Sep 14 2018 Hans de Goede <hdegoede@redhat.com> - 2.02-59
 - Stop using pkexec for grub2-set-bootflag, it does not work under gdm
   instead make it suid root (it was written with this in mind)