mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +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>
29 lines
1 KiB
Diff
29 lines
1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Fri, 27 Apr 2018 17:53:41 +0200
|
|
Subject: [PATCH] Use BLS version field to compare entries if id field isn't
|
|
defined
|
|
|
|
The BootLoaderSpec fragments generated by OSTree don't have the id field,
|
|
so grub2 will attempt to sort the entries by using the title field which
|
|
may not be correct. The entries do have a version field though so use it.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/commands/blscfg.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
|
|
index 6ab85df6b3a..c52d2b2e05a 100644
|
|
--- a/grub-core/commands/blscfg.c
|
|
+++ b/grub-core/commands/blscfg.c
|
|
@@ -418,6 +418,9 @@ static int bls_cmp(const void *p0, const void *p1, void *state UNUSED)
|
|
|
|
rc = bls_keyval_cmp (e0, e1, "id");
|
|
|
|
+ if (rc == 0)
|
|
+ rc = bls_keyval_cmp (e0, e1, "version");
|
|
+
|
|
if (rc == 0)
|
|
rc = bls_keyval_cmp (e0, e1, "title");
|
|
|