From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 15 Feb 2022 13:27:01 +0000 (+0100)
Subject: kernel-install: automatically generate "sort-key" field
X-Git-Tag: v251-rc1~96^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d23b3bfdd6bf476de38ad620c10e8b30b488feca;p=thirdparty%2Fsystemd.git

kernel-install: automatically generate "sort-key" field

Let's order by IMAGE_ID=/ID= by default.
---

diff --git a/src/kernel-install/90-loaderentry.install b/src/kernel-install/90-loaderentry.install
index c1d69aa8246..0e57df775f5 100644
--- a/src/kernel-install/90-loaderentry.install
+++ b/src/kernel-install/90-loaderentry.install
@@ -62,6 +62,9 @@ fi
 
 [ -n "$PRETTY_NAME" ] || PRETTY_NAME="Linux $KERNEL_VERSION"
 
+SORT_KEY="$IMAGE_ID"
+[ -z "$SORT_KEY" ] && SORT_KEY="$ID"
+
 if [ -r /etc/kernel/cmdline ]; then
     BOOT_OPTIONS="$(tr -s "$IFS" ' ' </etc/kernel/cmdline)"
 elif [ -r /usr/lib/kernel/cmdline ]; then
@@ -130,6 +133,7 @@ mkdir -p "${LOADER_ENTRY%/*}" || {
         # See similar logic above for the systemd.machine_id= kernel command line option
         echo "machine-id $MACHINE_ID"
     fi
+    [ -n "$SORT_KEY" ] && echo "sort-key   $SORT_KEY"
     echo "options    $BOOT_OPTIONS"
     echo "linux      $ENTRY_DIR/linux"