From c2a81558b66041ec8d3f17e66740c8f3a7ab3646 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 20 Jul 2024 22:25:13 +0200
Subject: [PATCH] use already local pacman chroot

---
 usr/lib/archboot/run/repository.sh | 4 ++--
 usr/lib/archboot/server.sh         | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/run/repository.sh b/usr/lib/archboot/run/repository.sh
index 40001b529..7f62769df 100755
--- a/usr/lib/archboot/run/repository.sh
+++ b/usr/lib/archboot/run/repository.sh
@@ -25,11 +25,11 @@ else
     if [[ "${_RUNNING_ARCH}" == "x86_64"  ]]; then
         if echo "${_BASENAME}" | rg -qw 'aarch64'; then
             _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_AARCH64_CHROOT_PUBLIC}" \
-                           "${_PACMAN_AARCH64_CHROOT}" || exit 1
+                           "${_ISO_HOME}/${_PACMAN_AARCH64_CHROOT}" || exit 1
         fi
         if echo "${_BASENAME}" | rg -qw 'riscv64'; then
             _pacman_chroot "${_REPODIR}" "${_ARCHBOOT_RISCV64_CHROOT_PUBLIC}" \
-                           "${_PACMAN_RISCV64_CHROOT}" || exit 1
+                           "${_ISO_HOME}/${_PACMAN_RISCV64_CHROOT}" || exit 1
         fi
         _create_pacman_conf "${_REPODIR}" "use_binfmt"
         _pacman_parameters "${_REPODIR}" "use_binfmt"
diff --git a/usr/lib/archboot/server.sh b/usr/lib/archboot/server.sh
index 0f0d8c811..9b0d6104f 100644
--- a/usr/lib/archboot/server.sh
+++ b/usr/lib/archboot/server.sh
@@ -20,10 +20,12 @@ _update_pacman_chroot() {
     # update pacman chroot
     cd "${_ISO_HOME}" || exit 1
     [[ -d "${_ARCH_DIR}" ]] || mkdir "${_ARCH_DIR}"
-    echo "Downloading pacman ${_ARCH} chroot..."
     if ! [[ -f pacman-${_ARCH}-chroot-latest.tar.zst ]]; then
+        echo "Downloading pacman ${_ARCH} chroot..."
         ${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}"
         ${_DLPROG} -O "${_ARCH_CHROOT_PUBLIC}"/"${_PACMAN_CHROOT}".sig
+    else
+        echo "Using local pacman ${_ARCH} chroot..."
     fi
     # verify download
     #shellcheck disable=SC2024