mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 09:51:50 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
31 lines
990 B
Diff
31 lines
990 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 4 Oct 2018 14:22:09 -0400
|
|
Subject: [PATCH] Reimplement boot_counter
|
|
|
|
This adds "increment" and "decrement" commands, and uses them to maintain our
|
|
variables in 01_fallback_counter. It also simplifies the counter logic, so
|
|
that there are no nested tests that conflict with each other.
|
|
|
|
Apparently, this *really* 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, 4 insertions(+)
|
|
|
|
diff --git a/util/grub.d/01_fallback_counting.in b/util/grub.d/01_fallback_counting.in
|
|
index 6ca13da03df..1a0b5fbecfc 100644
|
|
--- a/util/grub.d/01_fallback_counting.in
|
|
+++ b/util/grub.d/01_fallback_counting.in
|
|
@@ -1,5 +1,9 @@
|
|
#! /bin/sh -e
|
|
|
|
+if ! systemctl -q is-enabled greenboot.service >/dev/null 2>&1 ; then
|
|
+ exit 0
|
|
+fi
|
|
+
|
|
# Boot Counting
|
|
cat << EOF
|
|
insmod increment
|