From 65e1120ca8a3c03c55ec04d0ae19f1480ffdc76c Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 24 Jul 2023 17:20:32 +0200
Subject: [PATCH] fix aarch64 and riscv64 images

---
 usr/lib/archboot/common.sh  | 2 +-
 usr/lib/archboot/release.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index 7c2aa5c09..7f829e011 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -68,7 +68,7 @@ _kver() {
     # requirement for CONFIG_LOCALVERSION to be set.
     local kver re='^[[:digit:]]+(\.[[:digit:]]+)+'
     local arch bytes reader
-    arch="${_RUNNING_ARCH}"
+    arch="${_ARCH}"
     if [[ $arch == @(i?86|x86_64) ]]; then
         local -i offset
         offset="$(od -An -j0x20E -dN2 "$1")" || return
diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh
index 29da3ef22..6ce094419 100644
--- a/usr/lib/archboot/release.sh
+++ b/usr/lib/archboot/release.sh
@@ -34,14 +34,14 @@ _create_iso() {
     # create container
     archboot-"${_ARCH}"-create-container.sh "${_W_DIR}" -cc --install-source="${2}" || exit 1
     _create_archboot_db "${_W_DIR}${_CACHEDIR}"
+    . "${_W_DIR}/etc/archboot/presets/${_ARCH}"
+    _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_W_DIR}/${ALL_kver})"
     # riscv64 does not support kexec at the moment
     if ! [[ "${_ARCH}" == "riscv64" ]]; then
         # generate tarball in container, umount tmp container tmpfs, else weird things could happen
         # removing not working lvm2 from latest and local image first
         echo "Removing lvm2 from container ${_W_DIR}..."
         ${_NSPAWN} "${_W_DIR}" pacman -Rdd lvm2 --noconfirm &>/dev/null
-        . "${_W_DIR}/etc/archboot/presets/${_ARCH}"
-        _ISONAME="archboot-$(date +%Y.%m.%d-%H.%M)-$(_kver ${_W_DIR}/${ALL_kver})"
         echo "Generating local ISO..."
         # generate local iso in container
         #if [[ "${_ARCH}" == "x86_64" ]]; then