From 1c4c699c6eb044e57ccee334b0ba649e1e9dc86c Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 22 Jul 2024 20:40:41 +0200
Subject: [PATCH] resolve always _KERNEL

---
 usr/lib/archboot/release.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh
index 81423cb4b..aecb82195 100644
--- a/usr/lib/archboot/release.sh
+++ b/usr/lib/archboot/release.sh
@@ -39,6 +39,7 @@ _create_iso() {
     _create_archboot_db "${_W_DIR}${_CACHEDIR}"
     #shellcheck disable=SC1090
     . "${_W_DIR}/etc/archboot/${_ARCH}.conf"
+    _KERNEL="$(echo ${_KERNEL})"
     #shellcheck disable=SC2116,SC2046,SC2027,2086
     _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_W_DIR}/${_KERNEL})"
     if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then
@@ -47,23 +48,27 @@ _create_iso() {
         # init ramdisk
         _create_initrd_dir "${_ARCH}-init.conf"
         . "/etc/archboot/${_ARCH}-init.conf"
+        _KERNEL="$(echo ${_KERNEL})"
         _create_cpio "${_W_DIR}/tmp/initrd" "../../init-${_ARCH}.img"
         if ! [[ "${_ARCH}" == "riscv64" ]]; then
             # local ramdisk
             echo "Generating local initramfs..."
             _create_initrd_dir "${_W_DIR}/tmp/initrd" "${_CONFIG_LOCAL}"
             . "/etc/archboot/${_CONFIG_LOCAL}"
+            _KERNEL="$(echo ${_KERNEL})"
             _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-local-${_ARCH}.img"
             # latest ramdisk
             echo "Generating latest initramfs..."
             _create_initrd_dir "${_CONFIG_LATEST}"
             . "/etc/archboot/${_CONFIG_LATEST}"
+            _KERNEL="$(echo ${_KERNEL})"
             _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-latest-${_ARCH}.img"
         fi
         # normal ramdisk
         echo "Generating normal initramfs..."
         _create_initrd_dir "${_ARCH}.conf"
         . "/etc/archboot/${_ARCH}.conf"
+        _KERNEL="$(echo ${_KERNEL})"
         _create_cpio "${_W_DIR}/tmp/initrd" "../../initrd-${_ARCH}.img"
     fi
     # riscv64 does not support kexec at the moment