diff options
author | Mathieu Desnoyers <mathieu.desnoyers@efficios.com> | 2022-06-13 10:08:25 -0400 |
---|---|---|
committer | Daniel Kiper <daniel.kiper@oracle.com> | 2022-07-04 14:43:26 +0200 |
commit | 709c19794428d36fa58464299839f1095bcbf285 (patch) | |
tree | 520ca09b197b9b2882b09ab6286a13e5f44d23a8 | |
parent | 6f27d70a720e4a175ed2cebaaa6f62f3a39e062f (diff) | |
download | grub-709c19794428d36fa58464299839f1095bcbf285.tar.gz |
templates/kfreebsd: Fix quadratic algorithm for sorting menu items
The current implementation of the 10_kfreebsd script implements its menu
items sorting in bash with a quadratic algorithm, calling "sed", "sort",
"head", and "grep" to compare versions between individual lines, which
is annoyingly slow for kernel developers who can easily end up with
50-100 kernels in their boot partition.
This fix is ported from the 10_linux script, which has a similar
quadratic code pattern.
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: debian-bsd@lists.debian.org
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
-rw-r--r-- | util/grub.d/10_kfreebsd.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in index 199b20e16..0a67decaa 100644 --- a/util/grub.d/10_kfreebsd.in +++ b/util/grub.d/10_kfreebsd.in @@ -157,10 +157,16 @@ title_correction_code= # yet, so it's empty. In a submenu it will be equal to '\t' (one tab). submenu_indentation="" +# Perform a reverse version sort on the entire list. +# Temporarily replace the '.old' suffix by ' 1' and append ' 2' for all +# other files to order the '.old' files after their non-old counterpart +# in reverse-sorted order. + +reverse_sorted_list=$(echo ${list} | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | version_sort -r | sed -e 's/ 1$/.old/; s/ 2$//') + is_top_level=true -while [ "x$list" != "x" ] ; do - kfreebsd=`version_find_latest $list` +for kfreebsd in ${reverse_sorted_list}; do gettext_printf "Found kernel of FreeBSD: %s\n" "$kfreebsd" >&2 basename=`basename $kfreebsd` dirname=`dirname $kfreebsd` @@ -238,8 +244,6 @@ while [ "x$list" != "x" ] ; do if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then kfreebsd_entry "${OS}" "${version}" recovery "-s" fi - - list=`echo $list | tr ' ' '\n' | fgrep -vx "$kfreebsd" | tr '\n' ' '` done # If at least one kernel was found, then we need to |