|
 |
420527a |
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
420527a |
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
420527a |
Date: Tue, 16 Oct 2018 15:48:15 +0200
|
|
|
420527a |
Subject: [PATCH] 10_linux_bls: use grub2-rpm-sort instead of ls -vr to sort
|
|
|
420527a |
entries
|
|
|
420527a |
|
|
|
420527a |
Using ls -vr is wrong since it's not the same than the RPM sort algorithm.
|
|
|
420527a |
|
|
|
420527a |
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
|
420527a |
---
|
|
|
420527a |
util/grub.d/10_linux_bls.in | 18 +++++++++++++++---
|
|
|
420527a |
1 file changed, 15 insertions(+), 3 deletions(-)
|
|
|
420527a |
|
|
|
420527a |
diff --git a/util/grub.d/10_linux_bls.in b/util/grub.d/10_linux_bls.in
|
|
|
420527a |
index 8a3379578bd..1bc97f29898 100644
|
|
|
420527a |
--- a/util/grub.d/10_linux_bls.in
|
|
|
420527a |
+++ b/util/grub.d/10_linux_bls.in
|
|
|
420527a |
@@ -151,10 +151,22 @@ read_config()
|
|
|
420527a |
|
|
|
420527a |
populate_menu()
|
|
|
420527a |
{
|
|
|
420527a |
- entries_path="/boot/loader/entries"
|
|
|
420527a |
+ blsdir="/boot/loader/entries"
|
|
|
420527a |
+ local -a files
|
|
|
420527a |
+ local IFS=$'\n'
|
|
|
420527a |
gettext_printf "Generating boot entries from BLS files...\n" >&2
|
|
|
420527a |
- for config in $(ls -v -r $entries_path/*.conf); do
|
|
|
420527a |
- read_config ${config}
|
|
|
420527a |
+
|
|
|
420527a |
+ files=($(for bls in ${blsdir}/*.conf ; do
|
|
|
420527a |
+ if ! [[ -e "${bls}" ]] ; then
|
|
|
420527a |
+ continue
|
|
|
420527a |
+ fi
|
|
|
420527a |
+ bls="${bls%.conf}"
|
|
|
420527a |
+ bls="${bls##*/}"
|
|
|
420527a |
+ echo "${bls}"
|
|
|
420527a |
+ done | ${kernel_sort} | tac)) || :
|
|
|
420527a |
+
|
|
|
420527a |
+ for bls in "${files[@]}" ; do
|
|
|
420527a |
+ read_config "${blsdir}/${bls}.conf"
|
|
|
420527a |
menu="${menu}menuentry '${title}' {\n"
|
|
|
420527a |
menu="${menu}\t linux ${linux} ${options}\n"
|
|
|
420527a |
if [ -n "${initrd}" ] ; then
|