]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
90-loaderentry: use KERNEL_INSTALL_ENTRY_NAME
authorSimon de Vlieger <cmdr@supakeen.com>
Mon, 3 Aug 2026 16:47:54 +0000 (18:47 +0200)
committerSimon de Vlieger <cmdr@supakeen.com>
Thu, 6 Aug 2026 14:34:17 +0000 (16:34 +0200)
Replace the hardcoded $ENTRY_TOKEN-$KERNEL_VERSION pattern with
$KERNEL_INSTALL_ENTRY_NAME for the BLS Type#1 loader entry filename.
Falls back to $ENTRY_TOKEN-$KERNEL_VERSION when the variable is not set.

src/kernel-install/90-loaderentry.install.in

index 66cfec888625ff129b4be45a3c34c1f9da3badb7..f791cab3c24d68b3cc5d266936ca91ab6dbb7553 100755 (executable)
@@ -35,6 +35,7 @@ fi
 MACHINE_ID="${KERNEL_INSTALL_MACHINE_ID:?}"
 ENTRY_TOKEN="${KERNEL_INSTALL_ENTRY_TOKEN:?}"
 BOOT_ROOT="${KERNEL_INSTALL_BOOT_ROOT:?}"
+ENTRY_NAME="${KERNEL_INSTALL_ENTRY_NAME:-$ENTRY_TOKEN-$KERNEL_VERSION}"
 
 [ -n "$BOOT_MNT" ] || BOOT_MNT="$(stat -c %m "$BOOT_ROOT")"
 if [ "$BOOT_MNT" = '/' ]; then
@@ -45,7 +46,7 @@ fi
 
 KERNEL_DEST="$ENTRY_DIR_ABS/linux"
 KERNEL_ENTRY="$ENTRY_DIR/linux"
-LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_TOKEN-$KERNEL_VERSION.conf"
+LOADER_ENTRY="$BOOT_ROOT/loader/entries/$ENTRY_NAME.conf"
 
 case "$COMMAND" in
     remove)