From 5ea6221092afb7f131793b8364613e0100f30ad3 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 22 Jul 2024 23:44:29 +0200
Subject: [PATCH] cleanup _kver

---
 usr/lib/archboot/release.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh
index da339f4d2..8ced3d2d4 100644
--- a/usr/lib/archboot/release.sh
+++ b/usr/lib/archboot/release.sh
@@ -27,9 +27,8 @@ _usage () {
 }
 
 _create_initrd_dir() {
-    _KERNEL="$(echo ${_KERNEL})"
     ${_NSPAWN} "${_W_DIR}" /bin/bash -c "umount /tmp;rm -rf /tmp/*;archboot-cpio.sh \
-        -k ${_KERNEL} -c /etc/archboot/${1} -d /tmp/initrd" || exit 1
+        -c /etc/archboot/${1} -d /tmp/initrd" || exit 1
 }
 
 _create_iso() {
@@ -40,9 +39,9 @@ _create_iso() {
     _create_archboot_db "${_W_DIR}${_CACHEDIR}"
     #shellcheck disable=SC1090
     . "${_W_DIR}/etc/archboot/${_ARCH}.conf"
-    _KERNEL="$(echo ${_W_DIR}/${_KERNEL})"
+    _KVER="$(_kver ${_W_DIR}/${_KERNEL})"
     #shellcheck disable=SC2116,SC2046,SC2027,2086
-    _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_KERNEL})"
+    _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-${_KVER}"
     if ! [[ "${_RUNNING_ARCH}" == "${_ARCH}" ]]; then
         ### to speedup build for riscv64 and aarch64 on x86_64, run compressor on host system
         echo "Generating initramdisks..."