From 84fcc9eb072bafb2f9605be52c80fa86affd31f5 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Thu, 24 Nov 2022 13:00:32 +0100
Subject: [PATCH] move CACHEDIR to common

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

diff --git a/usr/lib/archboot/common.sh b/usr/lib/archboot/common.sh
index ecf1623f2..4d51e6f77 100644
--- a/usr/lib/archboot/common.sh
+++ b/usr/lib/archboot/common.sh
@@ -18,6 +18,7 @@ else
 fi
 _PACMAN_MIRROR="/etc/pacman.d/mirrorlist"
 _PACMAN_CONF="/etc/pacman.conf"
+_CACHEDIR="/var/cache/pacman/pkg"
 _FIX_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl glibc libtiff glib2 libcups harfbuzz avahi nss p11-kit libp11-kit fuse tpm2-tss libsecret smbclient libcap tevent libbsd libldap tdb ldb libmd jansson libsasl pcre2"
 _XORG_PACKAGE="xorg"
 _VNC_PACKAGE="tigervnc"
diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh
index 47a640032..1fe986dba 100644
--- a/usr/lib/archboot/container.sh
+++ b/usr/lib/archboot/container.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 # created by Tobias Powalowski <tpowa@archlinux.org>
 . /etc/archboot/defaults
-_CACHEDIR="/var/cache/pacman/pkg"
 
 _usage () {
     echo "CREATE ARCHBOOT CONTAINER"
@@ -82,7 +81,7 @@ _prepare_pacman() {
     # prepare pacman dirs
     echo "Create directories in ${1} ..."
     mkdir -p "${1}/var/lib/pacman"
-    mkdir -p "${_CACHEDIR}"
+    mkdir -p "${1}/${_CACHEDIR}"
     [[ -e "${1}/proc" ]] || mkdir -m 555 "${1}/proc"
     [[ -e "${1}/sys" ]] || mkdir -m 555 "${1}/sys"
     [[ -e "${1}/dev" ]] || mkdir -m 755 "${1}/dev"