mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 17:56:30 +00:00
420527a50b
- add 10_linux_bls grub.d snippet to generate menu entries from BLS files Resolves: rhbz#1636013 - Only set kernelopts in grubenv if it wasn't set before Resolves: rhbz#1636466 - kernel-install: Remove existing initramfs if it's older than the kernel (pjones) Resolves: rhbz#1638405 - Update the saved entry correctly after a kernel install (pjones) Resolves: rhbz#1638117 - blscfg: sort everything with rpm *package* comparison (pjones) Related: rhbz#1638103 - blscfg: Make 10_linux_bls sort the same way as well Related: rhbz#1638103 - don't set saved_entry on grub2-mkconfig Resolves: rhbz#1636466 - Fix menu entry selection based on ID and title (pjones) Resolves: rhbz#1640979 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
|