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>
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Thu, 11 Oct 2018 15:30:13 -0400
|
|
Subject: [PATCH] blscfg: don't include ".conf" at the end of our "id".
|
|
|
|
Related: rhbz#1638117
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/commands/blscfg.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/grub-core/commands/blscfg.c b/grub-core/commands/blscfg.c
|
|
index bec5a9ffe3e..3847572dabd 100644
|
|
--- a/grub-core/commands/blscfg.c
|
|
+++ b/grub-core/commands/blscfg.c
|
|
@@ -575,6 +575,7 @@ static void create_entry (struct bls_entry *entry)
|
|
char **initrds = NULL;
|
|
char *initrd = NULL;
|
|
char *id = entry->filename;
|
|
+ char *dotconf = id;
|
|
char *hotkey = NULL;
|
|
|
|
char *users = NULL;
|
|
@@ -593,6 +594,16 @@ static void create_entry (struct bls_entry *entry)
|
|
goto finish;
|
|
}
|
|
|
|
+ /*
|
|
+ * strip the ".conf" off the end before we make it our "id" field.
|
|
+ */
|
|
+ do
|
|
+ {
|
|
+ dotconf = grub_strstr(dotconf, ".conf");
|
|
+ } while (dotconf != NULL && dotconf[5] != '\0');
|
|
+ if (dotconf)
|
|
+ dotconf[0] = '\0';
|
|
+
|
|
title = bls_get_val (entry, "title", NULL);
|
|
options = expand_val (bls_get_val (entry, "options", NULL));
|
|
initrds = bls_make_list (entry, "initrd", NULL);
|