mirror of
https://github.com/systemd/systemd.git
synced 2026-08-09 09:32:04 +00:00
90-loaderentry: use KERNEL_INSTALL_ENTRY_NAME
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.
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user