From fcfe2f783bb58456256e866c4de3d1c8911e607e Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 1 Oct 2022 20:17:18 +0200
Subject: [PATCH] fix order

---
 usr/lib/archboot/container.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 4066fae0d..64b0f0b5f 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -153,12 +153,12 @@ _pacman_parameters() {
         _PACMAN_CACHEDIR="--cachedir ${_CACHEDIR}"
     fi
     # defaults used on every pacman call
-    _PACMAN_DEFAULTS="--config ${_PACMAN_CONF} --ignore systemd-resolvconf --noconfirm ${_CACHEDIR}"
+    _PACMAN_DEFAULTS="--config ${_PACMAN_CONF} ${_PACMAN_CACHEDIR} --ignore systemd-resolvconf --noconfirm"
 }
 
 _install_base_packages() {
-    _PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
     _pacman_parameters "${1}" "${2}"
+    _PACMAN_OPTIONS="${_PACKAGES} ${_PACMAN_DEFAULTS}"
     if [[ "${2}" == "use_binfmt" ]]; then
         [[ -d "${1}"/blankdb ]] || mkdir "${1}"/blankdb
         echo "Downloading ${_PACKAGES} to ${1} ..."
@@ -169,8 +169,8 @@ _install_base_packages() {
 }
 
 _install_archboot() {
-    _PACMAN_OPTIONS="${_ARCHBOOT} ${_PACMAN_DEFAULTS}"
     _pacman_parameters "${1}" "${2}"
+    _PACMAN_OPTIONS="${_ARCHBOOT} ${_PACMAN_DEFAULTS}"
     if [[ "${2}" == "use_binfmt" ]]; then
         _PACMAN_DB=""
         # riscv64 need does not support local image at the moment